[cig-commits] r13832 - cs/cigma/trunk/tests/libcigma

[luis at geodynamics.org]

Author: luis
Date: 2009-01-12 14:09:57 -0800 (Mon, 12 Jan 2009)
New Revision: 13832

Modified:
   cs/cigma/trunk/tests/libcigma/ResidualsTest.cpp
Log:
Fixes to ResidualsTest, since some methods were renamed

Modified: cs/cigma/trunk/tests/libcigma/ResidualsTest.cpp
===================================================================
--- cs/cigma/trunk/tests/libcigma/ResidualsTest.cpp	2009-01-12 22:09:56 UTC (rev 13831)
+++ cs/cigma/trunk/tests/libcigma/ResidualsTest.cpp	2009-01-12 22:09:57 UTC (rev 13832)
@@ -29,23 +29,23 @@
     eb_reader = FileReader::New("tests/data/brick1/connect.dat", "r");
     eb_reader->getConnectivity("", &(eb->connect), &(eb->nel), &(eb->ndofs));
 
-    mesh->setCellType(Cell::HEX8);
-
     mesh->setNodeCoordinates(nc);
     mesh->setElementBlock(eb);
+    mesh->setCellType(Cell::HEX8);
     //mesh->setLocator(...);
 
     shared_ptr<Residuals> residuals(new Residuals);
     residuals->setMesh(mesh);
-    residuals->resetAccumulator();
+    residuals->reset();
 
     shared_ptr<Cell> cell = Cell::New(mesh->cell_type);
     for (int e = 0; e < eb->n_cells(); e++)
     {
         mesh->getCell(e, *cell);
-        residuals->update(e, sqrt(2), cell->volume());
+        residuals->update(e, 2, 3);
     }
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(4.0, residuals->L2(), delta);
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(sqrt(2), residuals->max(), delta);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL(sqrt(2*8), residuals->L2(), delta);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL(sqrt(2*8/1.0), residuals->relative_L2(), delta);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL(sqrt(3), residuals->infinity_norm(), delta);
 }