[cig-commits] r4560 - short/3D/PyLith/trunk/libsrc/feassemble

[baagaard at geodynamics.org]

Author: baagaard
Date: 2006-09-16 14:47:30 -0700 (Sat, 16 Sep 2006)
New Revision: 4560

Added:
   short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.icc
Modified:
   short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.hh
   short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1D.hh
Log:
Fixed compilation errors and added inline accessor methods.

Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.hh	2006-09-16 04:41:32 UTC (rev 4559)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.hh	2006-09-16 21:47:30 UTC (rev 4560)
@@ -135,14 +135,20 @@
    *
    * @returns Array of basis functions evaluated at quadrature points.
    */
-  const double* basisFnsDeric(void) const;
+  const double* basisFnsDeriv(void) const;
 
-  /** Get basis functions evaluated at quadrature points.
+  /** Get coordinates of quadrature points.
    *
-   * @returns Array of basis functions evaluated at quadrature points.
+   * @returns Array of coordinates
    */
-  const double* basisFns(void) const;
+  const double* quadPts(void) const;
 
+  /** Get weights of quadrature points.
+   *
+   * @returns Array of weights
+   */
+  const double* quadWts(void) const;
+
 // PRIVATE MEMBERS //////////////////////////////////////////////////////
 private :
 
@@ -187,6 +193,8 @@
 
 }; // Quadrature
 
+#include "Quadrature.icc" // inline methods
+
 #endif // pylith_feassemble_quadrature_hh
 
 // End of file 

Added: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.icc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.icc	2006-09-16 04:41:32 UTC (rev 4559)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.icc	2006-09-16 21:47:30 UTC (rev 4560)
@@ -0,0 +1,43 @@
+// -*- C++ -*-
+//
+// ======================================================================
+//
+//                           Brad T. Aagaard
+//                        U.S. Geological Survey
+//
+// {LicenseText}
+//
+// ======================================================================
+//
+
+#if !defined(pylith_feassemble_quadrature_hh)
+#error "Quadrature.icc must be included only from Quadrature.hh"
+#else
+
+// Get basis functions evaluated at quadrature points.
+const double*
+pylith::feassemble::Quadrature::basisFns(void) const {
+  return _pBasisFns;
+}
+
+// Get derivatives of basis functions evaluated at quadrature points.
+const double*
+pylith::feassemble::Quadrature::basisFnsDeriv(void) const {
+  return _pBasisFnsDeriv;
+}
+
+// Get coordinates of quadrature points.
+const double*
+pylith::feassemble::Quadrature::quadPts(void) const {
+  return _pQuadPts;
+}
+
+// Get weights of quadrature points.
+const double*
+pylith::feassemble::Quadrature::quadWts(void) const {
+  return _pQuadWts;
+}
+
+#endif
+
+// End of file

Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1D.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1D.hh	2006-09-16 04:41:32 UTC (rev 4559)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1D.hh	2006-09-16 21:47:30 UTC (rev 4560)
@@ -10,41 +10,41 @@
 // ======================================================================
 //
 
-#if !defined(pylith_feassemble_elemgeometry1d_hh)
-#define pylith_feassemble_elemgeometry1d_hh
+#if !defined(pylith_feassemble_quadrature1d_hh)
+#define pylith_feassemble_quadrature1d_hh
 
-#include "ElemGeometry.hh"
+#include "Quadrature.hh"
 
 namespace pylith {
   namespace feassemble {
-    class ElemGeometry1D;
+    class Quadrature1D;
   } // feassemble
 } // pylith
 
-class pylith::feassemble::ElemGeometry1D
-{ // ElemGeometry1D
+class pylith::feassemble::Quadrature1D
+{ // Quadrature1D
   
 // PUBLIC MEMBERS ///////////////////////////////////////////////////////
 public :
 
   /// Constructor
-  ElemGeometry1D(void);
+  Quadrature1D(void);
 
   /// Destructor
-  ~ElemGeometry1D(void);
+  ~Quadrature1D(void);
 
   /** Compute geometry of element object.
    *
    */
-  void compute(const Obj<section_type>& coordinates,
-	       const point_type& cell,
+  void compute(const ALE::Obj<ALE::Mesh::section_type>& coordinates,
+	       const ALE::Mesh::point_type& cell,
 	       value_type* pV,
 	       value_type* pJacobian,
 	       valye_type* pJacobianInv,
 	       value_type* pJacobianDet);
 
-}; // ElemGeometry1D
+}; // Quadrature1D
 
-#endif // pylith_feassemble_elemgeometry1d_hh
+#endif // pylith_feassemble_quadrature1d_hh
 
 // End of file