[cig-commits] r19822 - in short/3D/PyLith/trunk: examples/3d/hex8 unittests/libtests/meshio

[brad at geodynamics.org]

Author: brad
Date: 2012-03-19 19:54:36 -0700 (Mon, 19 Mar 2012)
New Revision: 19822

Modified:
   short/3D/PyLith/trunk/examples/3d/hex8/pylithapp.cfg
   short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKPoints.cc
   short/3D/PyLith/trunk/unittests/libtests/meshio/TestOutputSolnPoints.cc
Log:
Updated unit tests for changes to OutputSolnPoints.

Modified: short/3D/PyLith/trunk/examples/3d/hex8/pylithapp.cfg
===================================================================
--- short/3D/PyLith/trunk/examples/3d/hex8/pylithapp.cfg	2012-03-19 22:56:09 UTC (rev 19821)
+++ short/3D/PyLith/trunk/examples/3d/hex8/pylithapp.cfg	2012-03-20 02:54:36 UTC (rev 19822)
@@ -1,4 +1,3 @@
-# -*- Python -*-
 [pylithapp]
 
 # This is not a self-contained simulation configuration file. This

Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKPoints.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKPoints.cc	2012-03-19 22:56:09 UTC (rev 19821)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKPoints.cc	2012-03-20 02:54:36 UTC (rev 19822)
@@ -74,12 +74,13 @@
 
   OutputSolnPoints output;
   DataWriterVTK<topology::Mesh, MeshField> writer;
+  spatialdata::units::Nondimensional normalizer;
 
   writer.filename(_data->timestepFilename);
   writer.timeFormat(_data->timeFormat);
   output.writer(&writer);
   output.setupInterpolator(_mesh, _data->points, 
-			   _data->numPoints, _data->spaceDim);
+			   _data->numPoints, _data->spaceDim, normalizer);
 
   const PylithScalar t = _data->time;
   const int numTimeSteps = 1;
@@ -109,6 +110,7 @@
 
   OutputSolnPoints output;
   DataWriterVTK<topology::Mesh, MeshField> writer;
+  spatialdata::units::Nondimensional normalizer;
 
   topology::Fields<MeshField> vertexFields(*_mesh);
   _createVertexFields(&vertexFields);
@@ -117,7 +119,7 @@
   writer.timeFormat(_data->timeFormat);
   output.writer(&writer);
   output.setupInterpolator(_mesh, _data->points, 
-			   _data->numPoints, _data->spaceDim);
+			   _data->numPoints, _data->spaceDim, normalizer);
 
   const int nfields = _data->numVertexFields;
 

Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestOutputSolnPoints.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestOutputSolnPoints.cc	2012-03-19 22:56:09 UTC (rev 19821)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestOutputSolnPoints.cc	2012-03-20 02:54:36 UTC (rev 19822)
@@ -113,6 +113,8 @@
 
   topology::Mesh mesh;
   spatialdata::geocoords::CSCart cs;
+  spatialdata::units::Nondimensional normalizer;
+
   cs.setSpaceDim(spaceDim);
   cs.initialize();
   mesh.coordsys(&cs);
@@ -122,7 +124,7 @@
 
   OutputSolnPoints output;
   CPPUNIT_ASSERT(data.points);
-  output.setupInterpolator(&mesh, data.points, numPoints, spaceDim);
+  output.setupInterpolator(&mesh, data.points, numPoints, spaceDim, normalizer);
 
   const topology::Mesh& pointsMesh = output.pointsMesh();
   const ALE::Obj<SieveMesh>& sievePointsMesh = pointsMesh.sieveMesh();