[cig-commits] r13071 - in cs/cigma/trunk: . src tests tests/data tests/libcigma tests/pytests

[luis at geodynamics.org]

Author: luis
Date: 2008-10-15 02:08:20 -0700 (Wed, 15 Oct 2008)
New Revision: 13071

Added:
   cs/cigma/trunk/tests/data/
   cs/cigma/trunk/tests/data/README
Modified:
   cs/cigma/trunk/Makefile.am
   cs/cigma/trunk/src/py_cigma_module.cpp
   cs/cigma/trunk/src/py_cigma_setup.py
   cs/cigma/trunk/tests/libcigma/MiscTest.cpp
   cs/cigma/trunk/tests/pytests/runner.py
   cs/cigma/trunk/tests/pytests/test_locator.py
Log:
Update build stuff ("make check" succeeds)

Modified: cs/cigma/trunk/Makefile.am
===================================================================
--- cs/cigma/trunk/Makefile.am	2008-10-15 09:08:19 UTC (rev 13070)
+++ cs/cigma/trunk/Makefile.am	2008-10-15 09:08:20 UTC (rev 13071)
@@ -104,12 +104,26 @@
 	src/Locator.cpp \
 	src/AnnLocator.h \
 	src/AnnLocator.cpp \
+	src/Cell.h \
+	src/Cell.cpp \
+	src/fe_tet4.h \
+	src/fe_tet4.cpp \
+	src/fe_hex8.h \
+	src/fe_hex8.cpp \
+	src/fe_quad4.h \
+	src/fe_quad4.cpp \
+	src/fe_tri3.h \
+	src/fe_tri3.cpp \
+	src/Quadrature.h \
+	src/Quadrature.cpp \
 	src/MeshPart.h \
 	src/MeshPart.cpp \
 	src/ElementBlock.h \
 	src/ElementBlock.cpp \
 	src/NodeCoordinates.h \
 	src/NodeCoordinates.cpp \
+	src/nc_array.h \
+	src/nc_array.cpp \
 	src/io_file_reader.h \
 	src/io_file_reader.cpp \
 	src/io_null_reader.h \
@@ -206,6 +220,8 @@
 	src/numpy_util.cpp \
 	src/py_DataPath.cpp \
 	src/py_Points.cpp \
+	src/py_Quadrature.cpp \
+	src/py_Cell.cpp \
 	src/py_Locator.cpp \
 	src/py_MeshPart.cpp \
 	src/py_ElementBlock.cpp \
@@ -248,8 +264,14 @@
 	tests/libcigma/DataPathTest.cpp \
 	tests/libcigma/PointsTest.h \
 	tests/libcigma/PointsTest.cpp \
+	tests/libcigma/CellTest.h \
+	tests/libcigma/CellTest.cpp \
 	tests/libcigma/NodeCoordinatesTest.h \
 	tests/libcigma/NodeCoordinatesTest.cpp \
+	tests/libcigma/ElementBlockTest.h \
+	tests/libcigma/ElementBlockTest.cpp \
+	tests/libcigma/ReaderTest.h \
+	tests/libcigma/ReaderTest.cpp \
 	tests/libcigma/MiscTest.h \
 	tests/libcigma/MiscTest.cpp \
 	tests/test_registry.cpp \

Modified: cs/cigma/trunk/src/py_cigma_module.cpp
===================================================================
--- cs/cigma/trunk/src/py_cigma_module.cpp	2008-10-15 09:08:19 UTC (rev 13070)
+++ cs/cigma/trunk/src/py_cigma_module.cpp	2008-10-15 09:08:20 UTC (rev 13071)
@@ -7,6 +7,8 @@
 extern void export_Hello();
 extern void export_DataPath();
 extern void export_Points();
+extern void export_Quadrature();
+extern void export_Cell();
 extern void export_Locator();
 extern void export_MeshPart();
 extern void export_ElementBlock();
@@ -21,10 +23,11 @@
     numeric::array::set_module_and_type("numpy", "ndarray");
 
     export_Exception();
-
     export_Hello();
     export_DataPath();
     export_Points();
+    export_Quadrature();
+    export_Cell();
     export_Locator();
     export_MeshPart();
     export_ElementBlock();

Modified: cs/cigma/trunk/src/py_cigma_setup.py
===================================================================
--- cs/cigma/trunk/src/py_cigma_setup.py	2008-10-15 09:08:19 UTC (rev 13070)
+++ cs/cigma/trunk/src/py_cigma_setup.py	2008-10-15 09:08:20 UTC (rev 13071)
@@ -21,6 +21,8 @@
     'py_Hello.cpp',
     'py_DataPath.cpp',
     'py_Points.cpp',
+    'py_Quadrature.cpp',
+    'py_Cell.cpp',
     'py_Locator.cpp',
     'py_MeshPart.cpp',
     'py_ElementBlock.cpp',

Added: cs/cigma/trunk/tests/data/README
===================================================================
--- cs/cigma/trunk/tests/data/README	                        (rev 0)
+++ cs/cigma/trunk/tests/data/README	2008-10-15 09:08:20 UTC (rev 13071)
@@ -0,0 +1,2 @@
+This directory contains small datasets for use in unit tests.
+

Modified: cs/cigma/trunk/tests/libcigma/MiscTest.cpp
===================================================================
--- cs/cigma/trunk/tests/libcigma/MiscTest.cpp	2008-10-15 09:08:19 UTC (rev 13070)
+++ cs/cigma/trunk/tests/libcigma/MiscTest.cpp	2008-10-15 09:08:20 UTC (rev 13071)
@@ -1,7 +1,7 @@
 #include "MiscTest.h"
+
 using namespace libcigma;
 
-
 MiscTest::MiscTest() {}
 MiscTest::~MiscTest() {}
 

Modified: cs/cigma/trunk/tests/pytests/runner.py
===================================================================
--- cs/cigma/trunk/tests/pytests/runner.py	2008-10-15 09:08:19 UTC (rev 13070)
+++ cs/cigma/trunk/tests/pytests/runner.py	2008-10-15 09:08:20 UTC (rev 13071)
@@ -1,9 +1,7 @@
 #!/usr/bin/env python
 
-
 if __name__ == '__main__':
 
-
     import os
     from os.path import abspath, dirname, splitext
     rootdir = dirname(abspath(__file__))

Modified: cs/cigma/trunk/tests/pytests/test_locator.py
===================================================================
--- cs/cigma/trunk/tests/pytests/test_locator.py	2008-10-15 09:08:19 UTC (rev 13070)
+++ cs/cigma/trunk/tests/pytests/test_locator.py	2008-10-15 09:08:20 UTC (rev 13071)
@@ -20,11 +20,11 @@
         self.loc = MyLocator(8)
     def tearDown(self):
         del self.loc
-    def test_n_dim(self):
+    def test_locator_ndim(self):
         self.assertEqual(self.loc.n_dim(), 3)
-    def test_n_idx(self):
+    def test_locator_nidx(self):
         self.assertEqual(self.loc.n_idx(), 8)
-    def test_check_idx(self):
+    def test_locator_check_idx(self):
         loc = self.loc
         n = loc.n_idx()
         self.assert_(loc.check_idx(0))