[cig-commits] r14280 - in short/3D/PyLith/branches/pylith-swig: modulesrc/feassemble pylith/feassemble unittests/pytests/feassemble
brad at geodynamics.org
brad at geodynamics.org
Mon Mar 9 19:40:01 PDT 2009
Author: brad
Date: 2009-03-09 19:39:58 -0700 (Mon, 09 Mar 2009)
New Revision: 14280
Added:
short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryHex3D.i
short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryLine1D.i
short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryLine2D.i
short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryLine3D.i
short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryPoint2D.i
short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryPoint3D.i
short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryQuad2D.i
short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryQuad3D.i
short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryTet3D.i
short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryTri2D.i
short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryTri3D.i
Modified:
short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/
short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/Makefile.am
short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/feassemble.i
short/3D/PyLith/branches/pylith-swig/pylith/feassemble/CellGeometry.py
short/3D/PyLith/branches/pylith-swig/pylith/feassemble/FIATLagrange.py
short/3D/PyLith/branches/pylith-swig/pylith/feassemble/FIATSimplex.py
short/3D/PyLith/branches/pylith-swig/unittests/pytests/feassemble/TestFIATLagrange.py
short/3D/PyLith/branches/pylith-swig/unittests/pytests/feassemble/TestFIATSimplex.py
Log:
Worked on feassemble SWIG stuff.
Property changes on: short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble
___________________________________________________________________
Name: svn:ignore
+ Makefile.am
feassemble.py
feassemble_wrap.cxx
Added: short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryHex3D.i
===================================================================
--- short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryHex3D.i (rev 0)
+++ short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryHex3D.i 2009-03-10 02:39:58 UTC (rev 14280)
@@ -0,0 +1,93 @@
+// -*- C++ -*-
+//
+// ======================================================================
+//
+// Brad T. Aagaard
+// U.S. Geological Survey
+//
+// {LicenseText}
+//
+// ======================================================================
+//
+
+/** @file modulesrc/feassemble/GeometryHex3D.i
+ *
+ * @brief Python interface to C++ GeometryHex3D object.
+ */
+
+namespace pylith {
+ namespace feassemble {
+
+ class GeometryHex3D : public CellGeometry
+ { // GeometryHex3D
+
+ // PUBLIC METHODS /////////////////////////////////////////////////
+ public :
+
+ /// Default constructor.
+ GeometryHex3D(void);
+
+ /// Default destructor.
+ ~GeometryHex3D(void);
+
+ /** Create a copy of geometry.
+ *
+ * @returns Copy of geometry.
+ */
+ CellGeometry* clone(void) const;
+
+ /** Get cell geometry for lower dimension cell.
+ *
+ * @returns Pointer to cell geometry object corresponding to next
+ * lower dimension, NULL if there is no lower dimension object.
+ */
+ CellGeometry* geometryLowerDim(void) const;
+
+ /** Transform coordinates in reference cell to global coordinates.
+ *
+ * @param ptsGlobal Array of points in global coordinate system.
+ * @param ptsRef Array of points in reference cell.
+ * @param vertices Array of cell vertices in global coordinates.
+ * @param dim Dimension of global coordinate system.
+ * @param npts Number of points to transform.
+ */
+ void ptsRefToGlobal(double* ptsGlobal,
+ const double* ptsRef,
+ const double* vertices,
+ const int dim,
+ const int npts =1) const;
+
+ /** Compute Jacobian at location in cell.
+ *
+ * @param jacobian Jacobian at location.
+ * @param det Determinant of Jacobian at location.
+ * @param vertices Coordinates of vertices of cell.
+ * @param location Location in reference cell at which to compute Jacobian.
+ */
+ void jacobian(pylith::double_array* jacobian,
+ double* det,
+ const pylith::double_array& vertices,
+ const pylith::double_array& location) const;
+
+ /** Compute Jacobian at location in cell.
+ *
+ * @param jacobian Jacobian at location.
+ * @param det Determinant of Jacobian at location.
+ * @param vertices Coordinates of vertices of cell.
+ * @param ptsRef Points in reference cell at which to compute Jacobian.
+ * @param dim Dimension of coordinate system.
+ * @param npts Number of points to transform.
+ */
+ void jacobian(double* jacobian,
+ double* det,
+ const double* vertices,
+ const double* ptsRef,
+ const int dim,
+ const int npts =1) const;
+
+ }; // GeometryHex3D
+
+ } // feassemble
+} // pylith
+
+// End of file
Added: short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryLine1D.i
===================================================================
--- short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryLine1D.i (rev 0)
+++ short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryLine1D.i 2009-03-10 02:39:58 UTC (rev 14280)
@@ -0,0 +1,94 @@
+// -*- C++ -*-
+//
+// ======================================================================
+//
+// Brad T. Aagaard
+// U.S. Geological Survey
+//
+// {LicenseText}
+//
+// ======================================================================
+//
+
+/** @file modulesrc/feassemble/GeometryLine1D.i
+ *
+ * @brief Python interface to C++ GeometryLine1D object.
+ */
+
+namespace pylith {
+ namespace feassemble {
+
+ class GeometryLine1D : public CellGeometry
+ { // GeometryLine1D
+
+ // PUBLIC METHODS /////////////////////////////////////////////////
+ public :
+
+ /// Default constructor.
+ GeometryLine1D(void);
+
+ /// Default destructor.
+ ~GeometryLine1D(void);
+
+ /** Create a copy of geometry.
+ *
+ * @returns Copy of geometry.
+ */
+ CellGeometry* clone(void) const;
+
+ /** Get cell geometry for lower dimension cell.
+ *
+ * @returns Pointer to cell geometry object corresponding to next
+ * lower dimension, NULL if there is no lower dimension object.
+ */
+ CellGeometry* geometryLowerDim(void) const;
+
+ /** Transform coordinates in reference cell to global coordinates.
+ *
+ * @param ptsGlobal Array of points in global coordinate system.
+ * @param ptsRef Array of points in reference cell.
+ * @param vertices Array of cell vertices in global coordinates.
+ * @param dim Dimension of global coordinate system.
+ * @param npts Number of points to transform.
+ */
+ void ptsRefToGlobal(double* ptsGlobal,
+ const double* ptsRef,
+ const double* vertices,
+ const int dim,
+ const int npts =1) const;
+
+ /** Compute Jacobian at location in cell.
+ *
+ * @param jacobian Jacobian at location.
+ * @param det Determinant of Jacobian at location.
+ * @param vertices Coordinates of vertices of cell.
+ * @param location Location in reference cell at which to compute Jacobian.
+ */
+ void jacobian(pylith::double_array* jacobian,
+ double* det,
+ const pylith::double_array& vertices,
+ const pylith::double_array& location) const;
+
+ /** Compute Jacobian at location in cell.
+ *
+ * @param jacobian Jacobian at location.
+ * @param det Determinant of Jacobian at location.
+ * @param vertices Coordinates of vertices of cell.
+ * @param ptsRef Points in reference cell at which to compute Jacobian.
+ * @param dim Dimension of coordinate system.
+ * @param npts Number of points to transform.
+ */
+ void jacobian(double* jacobian,
+ double* det,
+ const double* vertices,
+ const double* ptsRef,
+ const int dim,
+ const int npts =1) const;
+
+ }; // GeometryLine1D
+
+ } // feassemble
+} // pylith
+
+
+// End of file
Added: short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryLine2D.i
===================================================================
--- short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryLine2D.i (rev 0)
+++ short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryLine2D.i 2009-03-10 02:39:58 UTC (rev 14280)
@@ -0,0 +1,94 @@
+// -*- C++ -*-
+//
+// ======================================================================
+//
+// Brad T. Aagaard
+// U.S. Geological Survey
+//
+// {LicenseText}
+//
+// ======================================================================
+//
+
+/** @file modulesrc/feassemble/GeometryLine2D.i
+ *
+ * @brief Python interface to C++ GeometryLine2D object.
+ */
+
+namespace pylith {
+ namespace feassemble {
+
+ class GeometryLine2D : public CellGeometry
+ { // GeometryLine2D
+
+ // PUBLIC METHODS /////////////////////////////////////////////////
+ public :
+
+ /// Default constructor.
+ GeometryLine2D(void);
+
+ /// Default destructor.
+ ~GeometryLine2D(void);
+
+ /** Create a copy of geometry.
+ *
+ * @returns Copy of geometry.
+ */
+ CellGeometry* clone(void) const;
+
+ /** Get cell geometry for lower dimension cell.
+ *
+ * @returns Pointer to cell geometry object corresponding to next
+ * lower dimension, NULL if there is no lower dimension object.
+ */
+ CellGeometry* geometryLowerDim(void) const;
+
+ /** Transform coordinates in reference cell to global coordinates.
+ *
+ * @param ptsGlobal Array of points in global coordinate system.
+ * @param ptsRef Array of points in reference cell.
+ * @param vertices Array of cell vertices in global coordinates.
+ * @param dim Dimension of global coordinate system.
+ * @param npts Number of points to transform.
+ */
+ void ptsRefToGlobal(double* ptsGlobal,
+ const double* ptsRef,
+ const double* vertices,
+ const int dim,
+ const int npts =1) const;
+
+ /** Compute Jacobian at location in cell.
+ *
+ * @param jacobian Jacobian at location.
+ * @param det Determinant of Jacobian at location.
+ * @param vertices Coordinates of vertices of cell.
+ * @param location Location in reference cell at which to compute Jacobian.
+ */
+ void jacobian(pylith::double_array* jacobian,
+ double* det,
+ const pylith::double_array& vertices,
+ const pylith::double_array& location) const;
+
+ /** Compute Jacobian at location in cell.
+ *
+ * @param jacobian Jacobian at location.
+ * @param det Determinant of Jacobian at location.
+ * @param vertices Coordinates of vertices of cell.
+ * @param ptsRef Points in reference cell at which to compute Jacobian.
+ * @param dim Dimension of coordinate system.
+ * @param npts Number of points to transform.
+ */
+ void jacobian(double* jacobian,
+ double* det,
+ const double* vertices,
+ const double* ptsRef,
+ const int dim,
+ const int npts =1) const;
+
+ }; // GeometryLine2D
+
+ } // feassemble
+} // pylith
+
+
+// End of file
Added: short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryLine3D.i
===================================================================
--- short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryLine3D.i (rev 0)
+++ short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryLine3D.i 2009-03-10 02:39:58 UTC (rev 14280)
@@ -0,0 +1,94 @@
+// -*- C++ -*-
+//
+// ======================================================================
+//
+// Brad T. Aagaard
+// U.S. Geological Survey
+//
+// {LicenseText}
+//
+// ======================================================================
+//
+
+/** @file modulesrc/feassemble/GeometryLine3D.i
+ *
+ * @brief Python interface to C++ GeometryLine3D object.
+ */
+
+namespace pylith {
+ namespace feassemble {
+
+ class GeometryLine3D : public CellGeometry
+ { // GeometryLine3D
+
+ // PUBLIC METHODS /////////////////////////////////////////////////
+ public :
+
+ /// Default constructor.
+ GeometryLine3D(void);
+
+ /// Default destructor.
+ ~GeometryLine3D(void);
+
+ /** Create a copy of geometry.
+ *
+ * @returns Copy of geometry.
+ */
+ CellGeometry* clone(void) const;
+
+ /** Get cell geometry for lower dimension cell.
+ *
+ * @returns Pointer to cell geometry object corresponding to next
+ * lower dimension, NULL if there is no lower dimension object.
+ */
+ CellGeometry* geometryLowerDim(void) const;
+
+ /** Transform coordinates in reference cell to global coordinates.
+ *
+ * @param ptsGlobal Array of points in global coordinate system.
+ * @param ptsRef Array of points in reference cell.
+ * @param vertices Array of cell vertices in global coordinates.
+ * @param dim Dimension of global coordinate system.
+ * @param npts Number of points to transform.
+ */
+ void ptsRefToGlobal(double* ptsGlobal,
+ const double* ptsRef,
+ const double* vertices,
+ const int dim,
+ const int npts =1) const;
+
+ /** Compute Jacobian at location in cell.
+ *
+ * @param jacobian Jacobian at location.
+ * @param det Determinant of Jacobian at location.
+ * @param vertices Coordinates of vertices of cell.
+ * @param location Location in reference cell at which to compute Jacobian.
+ */
+ void jacobian(pylith::double_array* jacobian,
+ double* det,
+ const pylith::double_array& vertices,
+ const pylith::double_array& location) const;
+
+ /** Compute Jacobian at location in cell.
+ *
+ * @param jacobian Jacobian at location.
+ * @param det Determinant of Jacobian at location.
+ * @param vertices Coordinates of vertices of cell.
+ * @param ptsRef Points in reference cell at which to compute Jacobian.
+ * @param dim Dimension of coordinate system.
+ * @param npts Number of points to transform.
+ */
+ void jacobian(double* jacobian,
+ double* det,
+ const double* vertices,
+ const double* ptsRef,
+ const int dim,
+ const int npts =1) const;
+
+ }; // GeometryLine3D
+
+ } // feassemble
+} // pylith
+
+
+// End of file
Added: short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryPoint2D.i
===================================================================
--- short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryPoint2D.i (rev 0)
+++ short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryPoint2D.i 2009-03-10 02:39:58 UTC (rev 14280)
@@ -0,0 +1,94 @@
+// -*- C++ -*-
+//
+// ======================================================================
+//
+// Brad T. Aagaard
+// U.S. Geological Survey
+//
+// {LicenseText}
+//
+// ======================================================================
+//
+
+/** @file modulesrc/feassemble/GeometryPoint2D.i
+ *
+ * @brief Python interface to C++ GeometryPoint2D object.
+ */
+
+namespace pylith {
+ namespace feassemble {
+
+ class GeometryPoint2D : public CellGeometry
+ { // GeometryPoint2D
+
+ // PUBLIC METHODS /////////////////////////////////////////////////
+ public :
+
+ /// Default constructor.
+ GeometryPoint2D(void);
+
+ /// Default destructor.
+ ~GeometryPoint2D(void);
+
+ /** Create a copy of geometry.
+ *
+ * @returns Copy of geometry.
+ */
+ CellGeometry* clone(void) const;
+
+ /** Get cell geometry for lower dimension cell.
+ *
+ * @returns Pointer to cell geometry object corresponding to next
+ * lower dimension, NULL if there is no lower dimension object.
+ */
+ CellGeometry* geometryLowerDim(void) const;
+
+ /** Transform coordinates in reference cell to global coordinates.
+ *
+ * @param ptsGlobal Array of points in global coordinate system.
+ * @param ptsRef Array of points in reference cell.
+ * @param vertices Array of cell vertices in global coordinates.
+ * @param dim Dimension of global coordinate system.
+ * @param npts Number of points to transform.
+ */
+ void ptsRefToGlobal(double* ptsGlobal,
+ const double* ptsRef,
+ const double* vertices,
+ const int dim,
+ const int npts =1) const;
+
+ /** Compute Jacobian at location in cell.
+ *
+ * @param jacobian Jacobian at location.
+ * @param det Determinant of Jacobian at location.
+ * @param vertices Coordinates of vertices of cell.
+ * @param location Location in reference cell at which to compute Jacobian.
+ */
+ void jacobian(pylith::double_array* jacobian,
+ double* det,
+ const pylith::double_array& vertices,
+ const pylith::double_array& location) const;
+
+ /** Compute Jacobian at location in cell.
+ *
+ * @param jacobian Jacobian at location.
+ * @param det Determinant of Jacobian at location.
+ * @param vertices Coordinates of vertices of cell.
+ * @param ptsRef Points in reference cell at which to compute Jacobian.
+ * @param dim Dimension of coordinate system.
+ * @param npts Number of points to transform.
+ */
+ void jacobian(double* jacobian,
+ double* det,
+ const double* vertices,
+ const double* ptsRef,
+ const int dim,
+ const int npts =1) const;
+
+ }; // GeometryPoint2D
+
+ } // feassemble
+} // pylith
+
+
+// End of file
Added: short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryPoint3D.i
===================================================================
--- short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryPoint3D.i (rev 0)
+++ short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryPoint3D.i 2009-03-10 02:39:58 UTC (rev 14280)
@@ -0,0 +1,94 @@
+// -*- C++ -*-
+//
+// ======================================================================
+//
+// Brad T. Aagaard
+// U.S. Geological Survey
+//
+// {LicenseText}
+//
+// ======================================================================
+//
+
+/** @file modulesrc/feassemble/GeometryPoint3D.i
+ *
+ * @brief Python interface to C++ GeometryPoint3D object.
+ */
+
+namespace pylith {
+ namespace feassemble {
+
+ class GeometryPoint3D : public CellGeometry
+ { // GeometryPoint3D
+
+ // PUBLIC METHODS /////////////////////////////////////////////////
+ public :
+
+ /// Default constructor.
+ GeometryPoint3D(void);
+
+ /// Default destructor.
+ ~GeometryPoint3D(void);
+
+ /** Create a copy of geometry.
+ *
+ * @returns Copy of geometry.
+ */
+ CellGeometry* clone(void) const;
+
+ /** Get cell geometry for lower dimension cell.
+ *
+ * @returns Pointer to cell geometry object corresponding to next
+ * lower dimension, NULL if there is no lower dimension object.
+ */
+ CellGeometry* geometryLowerDim(void) const;
+
+ /** Transform coordinates in reference cell to global coordinates.
+ *
+ * @param ptsGlobal Array of points in global coordinate system.
+ * @param ptsRef Array of points in reference cell.
+ * @param vertices Array of cell vertices in global coordinates.
+ * @param dim Dimension of global coordinate system.
+ * @param npts Number of points to transform.
+ */
+ void ptsRefToGlobal(double* ptsGlobal,
+ const double* ptsRef,
+ const double* vertices,
+ const int dim,
+ const int npts =1) const;
+
+ /** Compute Jacobian at location in cell.
+ *
+ * @param jacobian Jacobian at location.
+ * @param det Determinant of Jacobian at location.
+ * @param vertices Coordinates of vertices of cell.
+ * @param location Location in reference cell at which to compute Jacobian.
+ */
+ void jacobian(pylith::double_array* jacobian,
+ double* det,
+ const pylith::double_array& vertices,
+ const pylith::double_array& location) const;
+
+ /** Compute Jacobian at location in cell.
+ *
+ * @param jacobian Jacobian at location.
+ * @param det Determinant of Jacobian at location.
+ * @param vertices Coordinates of vertices of cell.
+ * @param ptsRef Points in reference cell at which to compute Jacobian.
+ * @param dim Dimension of coordinate system.
+ * @param npts Number of points to transform.
+ */
+ void jacobian(double* jacobian,
+ double* det,
+ const double* vertices,
+ const double* ptsRef,
+ const int dim,
+ const int npts =1) const;
+
+ }; // GeometryPoint3D
+
+ } // feassemble
+} // pylith
+
+
+// End of file
Added: short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryQuad2D.i
===================================================================
--- short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryQuad2D.i (rev 0)
+++ short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryQuad2D.i 2009-03-10 02:39:58 UTC (rev 14280)
@@ -0,0 +1,93 @@
+// -*- C++ -*-
+//
+// ======================================================================
+//
+// Brad T. Aagaard
+// U.S. Geological Survey
+//
+// {LicenseText}
+//
+// ======================================================================
+//
+
+/** @file modulesrc/feassemble/GeometryQuad2D.i
+ *
+ * @brief Python interface to C++ GeometryQuad2D object.
+ */
+
+namespace pylith {
+ namespace feassemble {
+
+ class GeometryQuad2D : public CellGeometry
+ { // GeometryQuad2D
+
+ // PUBLIC METHODS /////////////////////////////////////////////////
+ public :
+
+ /// Default constructor.
+ GeometryQuad2D(void);
+
+ /// Default destructor.
+ ~GeometryQuad2D(void);
+
+ /** Create a copy of geometry.
+ *
+ * @returns Copy of geometry.
+ */
+ CellGeometry* clone(void) const;
+
+ /** Get cell geometry for lower dimension cell.
+ *
+ * @returns Pointer to cell geometry object corresponding to next
+ * lower dimension, NULL if there is no lower dimension object.
+ */
+ CellGeometry* geometryLowerDim(void) const;
+
+ /** Transform coordinates in reference cell to global coordinates.
+ *
+ * @param ptsGlobal Array of points in global coordinate system.
+ * @param ptsRef Array of points in reference cell.
+ * @param vertices Array of cell vertices in global coordinates.
+ * @param dim Dimension of global coordinate system.
+ * @param npts Number of points to transform.
+ */
+ void ptsRefToGlobal(double* ptsGlobal,
+ const double* ptsRef,
+ const double* vertices,
+ const int dim,
+ const int npts =1) const;
+
+ /** Compute Jacobian at location in cell.
+ *
+ * @param jacobian Jacobian at location.
+ * @param det Determinant of Jacobian at location.
+ * @param vertices Coordinates of vertices of cell.
+ * @param location Location in reference cell at which to compute Jacobian.
+ */
+ void jacobian(pylith::double_array* jacobian,
+ double* det,
+ const pylith::double_array& vertices,
+ const pylith::double_array& location) const;
+
+ /** Compute Jacobian at location in cell.
+ *
+ * @param jacobian Jacobian at location.
+ * @param det Determinant of Jacobian at location.
+ * @param vertices Coordinates of vertices of cell.
+ * @param ptsRef Points in reference cell at which to compute Jacobian.
+ * @param dim Dimension of coordinate system.
+ * @param npts Number of points to transform.
+ */
+ void jacobian(double* jacobian,
+ double* det,
+ const double* vertices,
+ const double* ptsRef,
+ const int dim,
+ const int npts =1) const;
+
+ }; // GeometryQuad2D
+
+ } // feassemble
+} // pylith
+
+// End of file
Added: short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryQuad3D.i
===================================================================
--- short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryQuad3D.i (rev 0)
+++ short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryQuad3D.i 2009-03-10 02:39:58 UTC (rev 14280)
@@ -0,0 +1,93 @@
+// -*- C++ -*-
+//
+// ======================================================================
+//
+// Brad T. Aagaard
+// U.S. Geological Survey
+//
+// {LicenseText}
+//
+// ======================================================================
+//
+
+/** @file modulesrc/feassemble/GeometryQuad3D.i
+ *
+ * @brief Python interface to C++ GeometryQuad3D object.
+ */
+
+namespace pylith {
+ namespace feassemble {
+
+ class GeometryQuad3D : public CellGeometry
+ { // GeometryQuad3D
+
+ // PUBLIC METHODS /////////////////////////////////////////////////
+ public :
+
+ /// Default constructor.
+ GeometryQuad3D(void);
+
+ /// Default destructor.
+ ~GeometryQuad3D(void);
+
+ /** Create a copy of geometry.
+ *
+ * @returns Copy of geometry.
+ */
+ CellGeometry* clone(void) const;
+
+ /** Get cell geometry for lower dimension cell.
+ *
+ * @returns Pointer to cell geometry object corresponding to next
+ * lower dimension, NULL if there is no lower dimension object.
+ */
+ CellGeometry* geometryLowerDim(void) const;
+
+ /** Transform coordinates in reference cell to global coordinates.
+ *
+ * @param ptsGlobal Array of points in global coordinate system.
+ * @param ptsRef Array of points in reference cell.
+ * @param vertices Array of cell vertices in global coordinates.
+ * @param dim Dimension of global coordinate system.
+ * @param npts Number of points to transform.
+ */
+ void ptsRefToGlobal(double* ptsGlobal,
+ const double* ptsRef,
+ const double* vertices,
+ const int dim,
+ const int npts =1) const;
+
+ /** Compute Jacobian at location in cell.
+ *
+ * @param jacobian Jacobian at location.
+ * @param det Determinant of Jacobian at location.
+ * @param vertices Coordinates of vertices of cell.
+ * @param location Location in reference cell at which to compute Jacobian.
+ */
+ void jacobian(pylith::double_array* jacobian,
+ double* det,
+ const pylith::double_array& vertices,
+ const pylith::double_array& location) const;
+
+ /** Compute Jacobian at location in cell.
+ *
+ * @param jacobian Jacobian at location.
+ * @param det Determinant of Jacobian at location.
+ * @param vertices Coordinates of vertices of cell.
+ * @param ptsRef Points in reference cell at which to compute Jacobian.
+ * @param dim Dimension of coordinate system.
+ * @param npts Number of points to transform.
+ */
+ void jacobian(double* jacobian,
+ double* det,
+ const double* vertices,
+ const double* ptsRef,
+ const int dim,
+ const int npts =1) const;
+
+ }; // GeometryQuad3D
+
+ } // feassemble
+} // pylith
+
+// End of file
Added: short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryTet3D.i
===================================================================
--- short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryTet3D.i (rev 0)
+++ short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryTet3D.i 2009-03-10 02:39:58 UTC (rev 14280)
@@ -0,0 +1,93 @@
+// -*- C++ -*-
+//
+// ======================================================================
+//
+// Brad T. Aagaard
+// U.S. Geological Survey
+//
+// {LicenseText}
+//
+// ======================================================================
+//
+
+/** @file modulesrc/feassemble/GeometryTet3D.i
+ *
+ * @brief Python interface to C++ GeometryTet3D object.
+ */
+
+namespace pylith {
+ namespace feassemble {
+
+ class GeometryTet3D : public CellGeometry
+ { // GeometryTet3D
+
+ // PUBLIC METHODS /////////////////////////////////////////////////
+ public :
+
+ /// Default constructor.
+ GeometryTet3D(void);
+
+ /// Default destructor.
+ ~GeometryTet3D(void);
+
+ /** Create a copy of geometry.
+ *
+ * @returns Copy of geometry.
+ */
+ CellGeometry* clone(void) const;
+
+ /** Get cell geometry for lower dimension cell.
+ *
+ * @returns Pointer to cell geometry object corresponding to next
+ * lower dimension, NULL if there is no lower dimension object.
+ */
+ CellGeometry* geometryLowerDim(void) const;
+
+ /** Transform coordinates in reference cell to global coordinates.
+ *
+ * @param ptsGlobal Array of points in global coordinate system.
+ * @param ptsRef Array of points in reference cell.
+ * @param vertices Array of cell vertices in global coordinates.
+ * @param dim Dimension of global coordinate system.
+ * @param npts Number of points to transform.
+ */
+ void ptsRefToGlobal(double* ptsGlobal,
+ const double* ptsRef,
+ const double* vertices,
+ const int dim,
+ const int npts =1) const;
+
+ /** Compute Jacobian at location in cell.
+ *
+ * @param jacobian Jacobian at location.
+ * @param det Determinant of Jacobian at location.
+ * @param vertices Coordinates of vertices of cell.
+ * @param location Location in reference cell at which to compute Jacobian.
+ */
+ void jacobian(pylith::double_array* jacobian,
+ double* det,
+ const pylith::double_array& vertices,
+ const pylith::double_array& location) const;
+
+ /** Compute Jacobian at location in cell.
+ *
+ * @param jacobian Jacobian at location.
+ * @param det Determinant of Jacobian at location.
+ * @param vertices Coordinates of vertices of cell.
+ * @param ptsRef Points in reference cell at which to compute Jacobian.
+ * @param dim Dimension of coordinate system.
+ * @param npts Number of points to transform.
+ */
+ void jacobian(double* jacobian,
+ double* det,
+ const double* vertices,
+ const double* ptsRef,
+ const int dim,
+ const int npts =1) const;
+
+ }; // GeometryTet3D
+
+ } // feassemble
+} // pylith
+
+// End of file
Added: short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryTri2D.i
===================================================================
--- short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryTri2D.i (rev 0)
+++ short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryTri2D.i 2009-03-10 02:39:58 UTC (rev 14280)
@@ -0,0 +1,93 @@
+// -*- C++ -*-
+//
+// ======================================================================
+//
+// Brad T. Aagaard
+// U.S. Geological Survey
+//
+// {LicenseText}
+//
+// ======================================================================
+//
+
+/** @file modulesrc/feassemble/GeometryTri2D.i
+ *
+ * @brief Python interface to C++ GeometryTri2D object.
+ */
+
+namespace pylith {
+ namespace feassemble {
+
+ class GeometryTri2D : public CellGeometry
+ { // GeometryTri2D
+
+ // PUBLIC METHODS /////////////////////////////////////////////////
+ public :
+
+ /// Default constructor.
+ GeometryTri2D(void);
+
+ /// Default destructor.
+ ~GeometryTri2D(void);
+
+ /** Create a copy of geometry.
+ *
+ * @returns Copy of geometry.
+ */
+ CellGeometry* clone(void) const;
+
+ /** Get cell geometry for lower dimension cell.
+ *
+ * @returns Pointer to cell geometry object corresponding to next
+ * lower dimension, NULL if there is no lower dimension object.
+ */
+ CellGeometry* geometryLowerDim(void) const;
+
+ /** Transform coordinates in reference cell to global coordinates.
+ *
+ * @param ptsGlobal Array of points in global coordinate system.
+ * @param ptsRef Array of points in reference cell.
+ * @param vertices Array of cell vertices in global coordinates.
+ * @param dim Dimension of global coordinate system.
+ * @param npts Number of points to transform.
+ */
+ void ptsRefToGlobal(double* ptsGlobal,
+ const double* ptsRef,
+ const double* vertices,
+ const int dim,
+ const int npts =1) const;
+
+ /** Compute Jacobian at location in cell.
+ *
+ * @param jacobian Jacobian at location.
+ * @param det Determinant of Jacobian at location.
+ * @param vertices Coordinates of vertices of cell.
+ * @param location Location in reference cell at which to compute Jacobian.
+ */
+ void jacobian(pylith::double_array* jacobian,
+ double* det,
+ const pylith::double_array& vertices,
+ const pylith::double_array& location) const;
+
+ /** Compute Jacobian at location in cell.
+ *
+ * @param jacobian Jacobian at location.
+ * @param det Determinant of Jacobian at location.
+ * @param vertices Coordinates of vertices of cell.
+ * @param ptsRef Points in reference cell at which to compute Jacobian.
+ * @param dim Dimension of coordinate system.
+ * @param npts Number of points to transform.
+ */
+ void jacobian(double* jacobian,
+ double* det,
+ const double* vertices,
+ const double* ptsRef,
+ const int dim,
+ const int npts =1) const;
+
+ }; // GeometryTri2D
+
+ } // feassemble
+} // pylith
+
+// End of file
Added: short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryTri3D.i
===================================================================
--- short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryTri3D.i (rev 0)
+++ short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/GeometryTri3D.i 2009-03-10 02:39:58 UTC (rev 14280)
@@ -0,0 +1,93 @@
+// -*- C++ -*-
+//
+// ======================================================================
+//
+// Brad T. Aagaard
+// U.S. Geological Survey
+//
+// {LicenseText}
+//
+// ======================================================================
+//
+
+/** @file modulesrc/feassemble/GeometryTri3D.i
+ *
+ * @brief Python interface to C++ GeometryTri3D object.
+ */
+
+namespace pylith {
+ namespace feassemble {
+
+ class GeometryTri3D : public CellGeometry
+ { // GeometryTri3D
+
+ // PUBLIC METHODS /////////////////////////////////////////////////
+ public :
+
+ /// Default constructor.
+ GeometryTri3D(void);
+
+ /// Default destructor.
+ ~GeometryTri3D(void);
+
+ /** Create a copy of geometry.
+ *
+ * @returns Copy of geometry.
+ */
+ CellGeometry* clone(void) const;
+
+ /** Get cell geometry for lower dimension cell.
+ *
+ * @returns Pointer to cell geometry object corresponding to next
+ * lower dimension, NULL if there is no lower dimension object.
+ */
+ CellGeometry* geometryLowerDim(void) const;
+
+ /** Transform coordinates in reference cell to global coordinates.
+ *
+ * @param ptsGlobal Array of points in global coordinate system.
+ * @param ptsRef Array of points in reference cell.
+ * @param vertices Array of cell vertices in global coordinates.
+ * @param dim Dimension of global coordinate system.
+ * @param npts Number of points to transform.
+ */
+ void ptsRefToGlobal(double* ptsGlobal,
+ const double* ptsRef,
+ const double* vertices,
+ const int dim,
+ const int npts =1) const;
+
+ /** Compute Jacobian at location in cell.
+ *
+ * @param jacobian Jacobian at location.
+ * @param det Determinant of Jacobian at location.
+ * @param vertices Coordinates of vertices of cell.
+ * @param location Location in reference cell at which to compute Jacobian.
+ */
+ void jacobian(pylith::double_array* jacobian,
+ double* det,
+ const pylith::double_array& vertices,
+ const pylith::double_array& location) const;
+
+ /** Compute Jacobian at location in cell.
+ *
+ * @param jacobian Jacobian at location.
+ * @param det Determinant of Jacobian at location.
+ * @param vertices Coordinates of vertices of cell.
+ * @param ptsRef Points in reference cell at which to compute Jacobian.
+ * @param dim Dimension of coordinate system.
+ * @param npts Number of points to transform.
+ */
+ void jacobian(double* jacobian,
+ double* det,
+ const double* vertices,
+ const double* ptsRef,
+ const int dim,
+ const int npts =1) const;
+
+ }; // GeometryTri3D
+
+ } // feassemble
+} // pylith
+
+// End of file
Modified: short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/Makefile.am
===================================================================
--- short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/Makefile.am 2009-03-10 02:33:39 UTC (rev 14279)
+++ short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/Makefile.am 2009-03-10 02:39:58 UTC (rev 14280)
@@ -20,7 +20,14 @@
swig_sources = \
feassemble.i \
CellGeometry.i \
- GeometryPoint1D.i
+ GeometryPoint1D.i \
+ GeometryPoint2D.i \
+ GeometryPoint3D.i \
+ GeometryLine1D.i \
+ GeometryLine2D.i \
+ GeometryLine3D.i \
+ GeometryTri2D.i \
+ GeometryTri3D.i
swig_generated = \
feassemble_wrap.cxx \
Modified: short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/feassemble.i
===================================================================
--- short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/feassemble.i 2009-03-10 02:33:39 UTC (rev 14279)
+++ short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/feassemble.i 2009-03-10 02:39:58 UTC (rev 14280)
@@ -17,6 +17,17 @@
%{
#include "pylith/feassemble/CellGeometry.hh"
#include "pylith/feassemble/GeometryPoint1D.hh"
+#include "pylith/feassemble/GeometryPoint2D.hh"
+#include "pylith/feassemble/GeometryPoint3D.hh"
+#include "pylith/feassemble/GeometryLine1D.hh"
+#include "pylith/feassemble/GeometryLine2D.hh"
+#include "pylith/feassemble/GeometryLine3D.hh"
+#include "pylith/feassemble/GeometryTri2D.hh"
+#include "pylith/feassemble/GeometryTri3D.hh"
+#include "pylith/feassemble/GeometryQuad2D.hh"
+#include "pylith/feassemble/GeometryQuad3D.hh"
+#include "pylith/feassemble/GeometryTet3D.hh"
+#include "pylith/feassemble/GeometryHex3D.hh"
#include "pylith/utils/arrayfwd.hh"
%}
@@ -44,6 +55,17 @@
%include "CellGeometry.i"
%include "GeometryPoint1D.i"
+%include "GeometryPoint2D.i"
+%include "GeometryPoint3D.i"
+%include "GeometryLine1D.i"
+%include "GeometryLine2D.i"
+%include "GeometryLine3D.i"
+%include "GeometryTri2D.i"
+%include "GeometryTri3D.i"
+%include "GeometryQuad2D.i"
+%include "GeometryQuad3D.i"
+%include "GeometryTet3D.i"
+%include "GeometryHex3D.i"
// End of file
Modified: short/3D/PyLith/branches/pylith-swig/pylith/feassemble/CellGeometry.py
===================================================================
--- short/3D/PyLith/branches/pylith-swig/pylith/feassemble/CellGeometry.py 2009-03-10 02:33:39 UTC (rev 14279)
+++ short/3D/PyLith/branches/pylith-swig/pylith/feassemble/CellGeometry.py 2009-03-10 02:39:58 UTC (rev 14280)
@@ -14,6 +14,8 @@
##
## @brief Python abstract base class for geometry of a finite-element cell.
+import feassemble
+
# ----------------------------------------------------------------------
# CellGeometry class
class CellGeometry(object):
@@ -31,10 +33,8 @@
# ----------------------------------------------------------------------
-from feassemble import GeometryPoint1D as ModuleGeometryPoint1D
-
# GeometryPoint1D class
-class GeometryPoint1D(ModuleGeometryPoint1D):
+class GeometryPoint1D(feassemble.GeometryPoint1D):
"""
Python object for geometry of a 0-D finite-element cell in 1-D.
"""
@@ -45,8 +45,201 @@
"""
Constructor.
"""
- ModuleGeometryPoint1D.__init__(self)
+ feassemble.GeometryPoint1D.__init__(self)
return
+# ----------------------------------------------------------------------
+# GeometryPoint2D class
+class GeometryPoint2D(feassemble.GeometryPoint2D):
+ """
+ Python object for geometry of a 0-D finite-element cell in 2-D.
+ """
+
+ # PUBLIC METHODS /////////////////////////////////////////////////////
+
+ def __init__(self):
+ """
+ Constructor.
+ """
+ feassemble.GeometryPoint2D.__init__(self)
+ return
+
+
+# ----------------------------------------------------------------------
+# GeometryPoint3D class
+class GeometryPoint3D(feassemble.GeometryPoint3D):
+ """
+ Python object for geometry of a 0-D finite-element cell in 3-D.
+ """
+
+ # PUBLIC METHODS /////////////////////////////////////////////////////
+
+ def __init__(self):
+ """
+ Constructor.
+ """
+ feassemble.GeometryPoint3D.__init__(self)
+ return
+
+
+# ----------------------------------------------------------------------
+# GeometryLine1D class
+class GeometryLine1D(feassemble.GeometryLine1D):
+ """
+ Python object for geometry of a 1-D finite-element cell in 1-D.
+ """
+
+ # PUBLIC METHODS /////////////////////////////////////////////////////
+
+ def __init__(self):
+ """
+ Constructor.
+ """
+ feassemble.GeometryLine1D.__init__(self)
+ return
+
+
+# ----------------------------------------------------------------------
+# GeometryLine2D class
+class GeometryLine2D(feassemble.GeometryLine2D):
+ """
+ Python object for geometry of a 1-D finite-element cell in 2-D.
+ """
+
+ # PUBLIC METHODS /////////////////////////////////////////////////////
+
+ def __init__(self):
+ """
+ Constructor.
+ """
+ feassemble.GeometryLine2D.__init__(self)
+ return
+
+
+# ----------------------------------------------------------------------
+# GeometryLine3D class
+class GeometryLine3D(feassemble.GeometryLine3D):
+ """
+ Python object for geometry of a 1-D finite-element cell in 3-D.
+ """
+
+ # PUBLIC METHODS /////////////////////////////////////////////////////
+
+ def __init__(self):
+ """
+ Constructor.
+ """
+ feassemble.GeometryLine3D.__init__(self)
+ return
+
+
+# ----------------------------------------------------------------------
+# GeometryTri2D class
+class GeometryTri2D(feassemble.GeometryTri2D):
+ """
+ Python object for geometry of a 2-D triangular finite-element cell
+ in 2-D.
+ """
+
+ # PUBLIC METHODS /////////////////////////////////////////////////////
+
+ def __init__(self):
+ """
+ Constructor.
+ """
+ feassemble.GeometryTri2D.__init__(self)
+ return
+
+
+# ----------------------------------------------------------------------
+# GeometryTri3D class
+class GeometryTri3D(feassemble.GeometryTri3D):
+ """
+ Python object for geometry of a 2-D triangular finite-element cell
+ in 3-D.
+ """
+
+ # PUBLIC METHODS /////////////////////////////////////////////////////
+
+ def __init__(self):
+ """
+ Constructor.
+ """
+ feassemble.GeometryTri3D.__init__(self)
+ return
+
+
+# ----------------------------------------------------------------------
+# GeometryQuad2D class
+class GeometryQuad2D(feassemble.GeometryQuad2D):
+ """
+ Python object for geometry of a 2-D quadrilateral finite-element cell
+ in 2-D.
+ """
+
+ # PUBLIC METHODS /////////////////////////////////////////////////////
+
+ def __init__(self):
+ """
+ Constructor.
+ """
+ feassemble.GeometryQuad2D.__init__(self)
+ return
+
+
+# ----------------------------------------------------------------------
+# GeometryQuad3D class
+class GeometryQuad3D(feassemble.GeometryQuad3D):
+ """
+ Python object for geometry of a 2-D quadrilateral finite-element cell
+ in 3-D.
+ """
+
+ # PUBLIC METHODS /////////////////////////////////////////////////////
+
+ def __init__(self):
+ """
+ Constructor.
+ """
+ feassemble.GeometryQuad3D.__init__(self)
+ return
+
+
+# ----------------------------------------------------------------------
+# GeometryTet3D class
+class GeometryTet3D(feassemble.GeometryTet3D):
+ """
+ Python object for geometry of a 3-D tetrahedral finite-element cell
+ in 3-D.
+ """
+
+ # PUBLIC METHODS /////////////////////////////////////////////////////
+
+ def __init__(self):
+ """
+ Constructor.
+ """
+ feassemble.GeometryTet3D.__init__(self)
+ return
+
+
+# ----------------------------------------------------------------------
+# GeometryHex3D class
+class GeometryHex3D(feassemble.GeometryHex3D):
+ """
+ Python object for geometry of a 3-D hexahedral finite-element cell
+ in 3-D.
+ """
+
+ # PUBLIC METHODS /////////////////////////////////////////////////////
+
+ def __init__(self):
+ """
+ Constructor.
+ """
+ feassemble.GeometryHex3D.__init__(self)
+ return
+
+
# End of file
Modified: short/3D/PyLith/branches/pylith-swig/pylith/feassemble/FIATLagrange.py
===================================================================
--- short/3D/PyLith/branches/pylith-swig/pylith/feassemble/FIATLagrange.py 2009-03-10 02:33:39 UTC (rev 14279)
+++ short/3D/PyLith/branches/pylith-swig/pylith/feassemble/FIATLagrange.py 2009-03-10 02:39:58 UTC (rev 14280)
@@ -681,38 +681,30 @@
"""
Setup reference cell geometry object.
"""
+ import CellGeometry
self.geometry = None
if 3 == self.cellDim:
if 3 == spaceDim:
- from geometry.GeometryHex3D import GeometryHex3D
- self.geometry = GeometryHex3D()
+ self.geometry = CellGeometry.GeometryHex3D()
elif 2 == self.cellDim:
if 2 == spaceDim:
- from geometry.GeometryQuad2D import GeometryQuad2D
- self.geometry = GeometryQuad2D()
+ self.geometry = CellGeometry.GeometryQuad2D()
elif 3 == spaceDim:
- from geometry.GeometryQuad3D import GeometryQuad3D
- self.geometry = GeometryQuad3D()
+ self.geometry = CellGeometry.GeometryQuad3D()
elif 1 == self.cellDim:
if 1 == spaceDim:
- from geometry.GeometryLine1D import GeometryLine1D
- self.geometry = GeometryLine1D()
+ self.geometry = CellGeometry.GeometryLine1D()
elif 2 == spaceDim:
- from geometry.GeometryLine2D import GeometryLine2D
- self.geometry = GeometryLine2D()
+ self.geometry = CellGeometry.GeometryLine2D()
elif 3 == spaceDim:
- from geometry.GeometryLine3D import GeometryLine3D
- self.geometry = GeometryLine3D()
+ self.geometry = CellGeometry.GeometryLine3D()
elif 0 == self.cellDim:
if 1 == spaceDim:
- from geometry.GeometryPoint1D import GeometryPoint1D
- self.geometry = GeometryPoint1D()
+ self.geometry = CellGeometry.GeometryPoint1D()
elif 2 == spaceDim:
- from geometry.GeometryPoint2D import GeometryPoint2D
- self.geometry = GeometryPoint2D()
+ self.geometry = CellGeometry.GeometryPoint2D()
elif 3 == spaceDim:
- from geometry.GeometryPoint3D import GeometryPoint3D
- self.geometry = GeometryPoint3D()
+ self.geometry = CellGeometry.GeometryPoint3D()
if None == self.geometry:
raise ValueError("Could not set shape of cell for '%s' in spatial " \
"dimension '%s'." % (self.name, spaceDim))
Modified: short/3D/PyLith/branches/pylith-swig/pylith/feassemble/FIATSimplex.py
===================================================================
--- short/3D/PyLith/branches/pylith-swig/pylith/feassemble/FIATSimplex.py 2009-03-10 02:33:39 UTC (rev 14279)
+++ short/3D/PyLith/branches/pylith-swig/pylith/feassemble/FIATSimplex.py 2009-03-10 02:39:58 UTC (rev 14280)
@@ -158,39 +158,32 @@
"""
Setup reference cell geometry object.
"""
+ import CellGeometry
+
self.geometry = None
name = self.shape.lower()
if "tetrahedron" == name:
if 3 == spaceDim:
- from geometry.GeometryTet3D import GeometryTet3D
- self.geometry = GeometryTet3D()
+ self.geometry = CellGeometry.GeometryTet3D()
elif "triangle" == name:
if 2 == spaceDim:
- from geometry.GeometryTri2D import GeometryTri2D
- self.geometry = GeometryTri2D()
+ self.geometry = CellGeometry.GeometryTri2D()
elif 3 == spaceDim:
- from geometry.GeometryTri3D import GeometryTri3D
- self.geometry = GeometryTri3D()
+ self.geometry = CellGeometry.GeometryTri3D()
elif "line" == name:
if 1 == spaceDim:
- from geometry.GeometryLine1D import GeometryLine1D
- self.geometry = GeometryLine1D()
+ self.geometry = CellGeometry.GeometryLine1D()
elif 2 == spaceDim:
- from geometry.GeometryLine2D import GeometryLine2D
- self.geometry = GeometryLine2D()
+ self.geometry = CellGeometry.GeometryLine2D()
elif 3 == spaceDim:
- from geometry.GeometryLine3D import GeometryLine3D
- self.geometry = GeometryLine3D()
+ self.geometry = CellGeometry.GeometryLine3D()
elif "point" == name:
if 1 == spaceDim:
- from geometry.GeometryPoint1D import GeometryPoint1D
- self.geometry = GeometryPoint1D()
+ self.geometry = CellGeometry.GeometryPoint1D()
elif 2 == spaceDim:
- from geometry.GeometryPoint2D import GeometryPoint2D
- self.geometry = GeometryPoint2D()
+ self.geometry = CellGeometry.GeometryPoint2D()
elif 3 == spaceDim:
- from geometry.GeometryPoint3D import GeometryPoint3D
- self.geometry = GeometryPoint3D()
+ self.geometry = CellGeometry.GeometryPoint3D()
if None == self.geometry:
raise ValueError("Could not set shape of cell for '%s' in spatial " \
"dimension '%s'." % (self.name, spaceDim))
Modified: short/3D/PyLith/branches/pylith-swig/unittests/pytests/feassemble/TestFIATLagrange.py
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/pytests/feassemble/TestFIATLagrange.py 2009-03-10 02:33:39 UTC (rev 14279)
+++ short/3D/PyLith/branches/pylith-swig/unittests/pytests/feassemble/TestFIATLagrange.py 2009-03-10 02:39:58 UTC (rev 14280)
@@ -369,7 +369,7 @@
cellE = Line2()
self._checkVals(cellE, cell)
- from pylith.feassemble.geometry.GeometryLine1D import GeometryLine1D
+ from pylith.feassemble.CellGeometry import GeometryLine1D
self.failUnless(isinstance(cell.geometry, GeometryLine1D))
return
@@ -387,7 +387,7 @@
cellE = Line3()
self._checkVals(cellE, cell)
- from pylith.feassemble.geometry.GeometryLine2D import GeometryLine2D
+ from pylith.feassemble.CellGeometry import GeometryLine2D
self.failUnless(isinstance(cell.geometry, GeometryLine2D))
return
@@ -405,7 +405,7 @@
cellE = Quad4()
self._checkVals(cellE, cell)
- from pylith.feassemble.geometry.GeometryQuad2D import GeometryQuad2D
+ from pylith.feassemble.CellGeometry import GeometryQuad2D
self.failUnless(isinstance(cell.geometry, GeometryQuad2D))
return
@@ -423,7 +423,7 @@
cellE = Hex8()
self._checkVals(cellE, cell)
- from pylith.feassemble.geometry.GeometryHex3D import GeometryHex3D
+ from pylith.feassemble.CellGeometry import GeometryHex3D
self.failUnless(isinstance(cell.geometry, GeometryHex3D))
return
Modified: short/3D/PyLith/branches/pylith-swig/unittests/pytests/feassemble/TestFIATSimplex.py
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/pytests/feassemble/TestFIATSimplex.py 2009-03-10 02:33:39 UTC (rev 14279)
+++ short/3D/PyLith/branches/pylith-swig/unittests/pytests/feassemble/TestFIATSimplex.py 2009-03-10 02:39:58 UTC (rev 14280)
@@ -311,7 +311,7 @@
cellE = Line2()
self._checkVals(cellE, cell)
- from pylith.feassemble.geometry.GeometryLine1D import GeometryLine1D
+ from pylith.feassemble.CellGeometry import GeometryLine1D
self.failUnless(isinstance(cell.geometry, GeometryLine1D))
return
@@ -328,7 +328,7 @@
cellE = Line3()
self._checkVals(cellE, cell)
- from pylith.feassemble.geometry.GeometryLine2D import GeometryLine2D
+ from pylith.feassemble.CellGeometry import GeometryLine2D
self.failUnless(isinstance(cell.geometry, GeometryLine2D))
return
@@ -345,7 +345,7 @@
cellE = Tri3()
self._checkVals(cellE, cell)
- from pylith.feassemble.geometry.GeometryTri2D import GeometryTri2D
+ from pylith.feassemble.CellGeometry import GeometryTri2D
self.failUnless(isinstance(cell.geometry, GeometryTri2D))
return
@@ -362,7 +362,7 @@
cellE = Tet4()
self._checkVals(cellE, cell)
- from pylith.feassemble.geometry.GeometryTet3D import GeometryTet3D
+ from pylith.feassemble.CellGeometry import GeometryTet3D
self.failUnless(isinstance(cell.geometry, GeometryTet3D))
return
More information about the CIG-COMMITS
mailing list