[cig-commits] r7227 - in short/3D/PyLith/trunk: libsrc/feassemble libsrc/topology unittests/libtests/feassemble unittests/libtests/topology

[brad at geodynamics.org]

Author: brad
Date: 2007-06-14 07:48:22 -0700 (Thu, 14 Jun 2007)
New Revision: 7227

Modified:
   short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.cc
   short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.hh
   short/3D/PyLith/trunk/libsrc/topology/FieldsManager.hh
   short/3D/PyLith/trunk/unittests/libtests/feassemble/Makefile.am
   short/3D/PyLith/trunk/unittests/libtests/topology/test_topology.cc
Log:
Removed extraneous journal and Python code from topology unit unittests/libtests/topology/test_topology.cctest driver.

Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.cc	2007-06-14 14:17:55 UTC (rev 7226)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.cc	2007-06-14 14:48:22 UTC (rev 7227)
@@ -246,6 +246,9 @@
   _jacobian = 0.0;
   _jacobianDet = 0.0;
   _jacobianInv = 0.0;
+#if 0
+  _basisDeriv = 0.0;
+#endif
   _quadPts = 0.0;
 } // _resetGeometry
 

Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.hh	2007-06-14 14:17:55 UTC (rev 7226)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.hh	2007-06-14 14:48:22 UTC (rev 7227)
@@ -320,6 +320,7 @@
    * size = numQuadPts * numBasis * cellDim
    * index = iQuadPt*numBasis*cellDim + iBasis*cellDim + iDim
    */
+  double _basisDeriv;
   //double_array _basisDeriv;
 
   /** Array of Jacobians evaluated at quadrature points.

Modified: short/3D/PyLith/trunk/libsrc/topology/FieldsManager.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/topology/FieldsManager.hh	2007-06-14 14:17:55 UTC (rev 7226)
+++ short/3D/PyLith/trunk/libsrc/topology/FieldsManager.hh	2007-06-14 14:48:22 UTC (rev 7227)
@@ -130,7 +130,7 @@
 private :
 
   /// Not implemented
-  FieldsManager(const FieldsManager& m);
+  FieldsManager(const FieldsManager&);
 
   /// Not implemented
   const FieldsManager& operator=(const FieldsManager&);

Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/Makefile.am	2007-06-14 14:17:55 UTC (rev 7226)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/Makefile.am	2007-06-14 14:48:22 UTC (rev 7227)
@@ -22,21 +22,6 @@
 # Primary source files
 testfeassemble_SOURCES = \
 	TestCellGeometry.cc \
-	TestElasticity.cc \
-	TestElasticityExplicit.cc \
-	TestElasticityExplicit1DLinear.cc \
-	TestElasticityExplicit1DQuadratic.cc \
-	TestElasticityExplicit2DLinear.cc \
-	TestElasticityExplicit2DQuadratic.cc \
-	TestElasticityExplicit3DLinear.cc \
-	TestElasticityExplicit3DQuadratic.cc \
-	TestElasticityImplicit.cc \
-	TestElasticityImplicit1DLinear.cc \
-	TestElasticityImplicit1DQuadratic.cc \
-	TestElasticityImplicit2DLinear.cc \
-	TestElasticityImplicit2DQuadratic.cc \
-	TestElasticityImplicit3DLinear.cc \
-	TestElasticityImplicit3DQuadratic.cc \
 	TestGeometryPoint1D.cc \
 	TestGeometryPoint2D.cc \
 	TestGeometryPoint3D.cc \
@@ -59,6 +44,22 @@
 	TestQuadrature3D.cc \
 	test_feassemble.cc
 
+#	TestElasticity.cc \
+#	TestElasticityExplicit.cc \
+#	TestElasticityExplicit1DLinear.cc \
+#	TestElasticityExplicit1DQuadratic.cc \
+#	TestElasticityExplicit2DLinear.cc \
+#	TestElasticityExplicit2DQuadratic.cc \
+#	TestElasticityExplicit3DLinear.cc \
+#	TestElasticityExplicit3DQuadratic.cc \
+#	TestElasticityImplicit.cc \
+#	TestElasticityImplicit1DLinear.cc \
+#	TestElasticityImplicit1DQuadratic.cc \
+#	TestElasticityImplicit2DLinear.cc \
+#	TestElasticityImplicit2DQuadratic.cc \
+#	TestElasticityImplicit3DLinear.cc \
+#	TestElasticityImplicit3DQuadratic.cc
+
 noinst_HEADERS = \
 	TestCellGeometry.hh \
 	TestElasticity.hh \

Modified: short/3D/PyLith/trunk/unittests/libtests/topology/test_topology.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/topology/test_topology.cc	2007-06-14 14:17:55 UTC (rev 7226)
+++ short/3D/PyLith/trunk/unittests/libtests/topology/test_topology.cc	2007-06-14 14:48:22 UTC (rev 7227)
@@ -26,8 +26,6 @@
 
 #include <stdlib.h> // USES abort()
 
-#include "journal/info.h"
-
 int
 main(int argc,
      char* argv[])
@@ -39,12 +37,6 @@
     PetscErrorCode err = PetscInitialize(&argc, &argv, PETSC_NULL, PETSC_NULL);
     CHKERRQ(err);
 
-    // Initialize Python
-    Py_Initialize();
-
-    journal::info_t info("gmvfile");
-    //info.activate();
-
     // Create event manager and test controller
     CppUnit::TestResult controller;
 
@@ -64,9 +56,6 @@
     CppUnit::TextOutputter outputter(&result, std::cerr);
     outputter.write();
 
-    // Finalize Python
-    Py_Finalize();
-
     // Finalize PETSc
     err = PetscFinalize();
     CHKERRQ(err);