[cig-commits] r18835 - short/3D/PyLith/branches/v1.6-stable/unittests/libtests/topology
brad at geodynamics.org
brad at geodynamics.org
Thu Aug 18 13:52:50 PDT 2011
Author: brad
Date: 2011-08-18 13:52:50 -0700 (Thu, 18 Aug 2011)
New Revision: 18835
Modified:
short/3D/PyLith/branches/v1.6-stable/unittests/libtests/topology/TestFieldMesh.cc
short/3D/PyLith/branches/v1.6-stable/unittests/libtests/topology/TestFieldSubMesh.cc
Log:
Updated for changes to createScatter().
Modified: short/3D/PyLith/branches/v1.6-stable/unittests/libtests/topology/TestFieldMesh.cc
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/unittests/libtests/topology/TestFieldMesh.cc 2011-08-17 12:37:42 UTC (rev 18834)
+++ short/3D/PyLith/branches/v1.6-stable/unittests/libtests/topology/TestFieldMesh.cc 2011-08-18 20:52:50 UTC (rev 18835)
@@ -346,8 +346,8 @@
++v_iter, index += nconstraints[i++])
section->setConstraintDof(*v_iter, &constraints[index]);
fieldSrc.zero();
- fieldSrc.createScatter();
- fieldSrc.createScatter("A");
+ fieldSrc.createScatter(mesh);
+ fieldSrc.createScatter(mesh, "A");
} // Setup source field
Field<Mesh> field(mesh);
@@ -878,7 +878,7 @@
const int sizeE = vertices->size() * fiberDim;
CPPUNIT_ASSERT_EQUAL(size_t(0), field._scatters.size());
- field.createScatter();
+ field.createScatter(mesh);
CPPUNIT_ASSERT_EQUAL(size_t(1), field._scatters.size());
const Field<Mesh>::ScatterInfo& sinfo = field._getScatter("");
CPPUNIT_ASSERT(sinfo.scatter);
@@ -895,11 +895,11 @@
CPPUNIT_ASSERT_EQUAL(label, std::string(vecname));
// Make sure we can do multiple calls to createScatter().
- field.createScatter();
+ field.createScatter(mesh);
CPPUNIT_ASSERT_EQUAL(size_t(1), field._scatters.size());
// Create another scatter.
- field.createScatter("B");
+ field.createScatter(mesh, "B");
CPPUNIT_ASSERT_EQUAL(size_t(2), field._scatters.size());
const Field<Mesh>::ScatterInfo& sinfoB = field._getScatter("B");
CPPUNIT_ASSERT(sinfoB.scatter);
@@ -945,7 +945,7 @@
const int sizeE = vertices->size() * fiberDim;
CPPUNIT_ASSERT_EQUAL(size_t(0), field._scatters.size());
- field.createScatterWithBC();
+ field.createScatterWithBC(mesh);
CPPUNIT_ASSERT_EQUAL(size_t(1), field._scatters.size());
const Field<Mesh>::ScatterInfo& sinfo = field._getScatter("");
CPPUNIT_ASSERT(sinfo.scatter);
@@ -962,11 +962,11 @@
CPPUNIT_ASSERT_EQUAL(label, std::string(vecname));
// Make sure we can do multiple calls to createScatterWithBC().
- field.createScatterWithBC();
+ field.createScatterWithBC(mesh);
CPPUNIT_ASSERT_EQUAL(size_t(1), field._scatters.size());
// Create another scatter.
- field.createScatterWithBC("B");
+ field.createScatterWithBC(mesh, "B");
CPPUNIT_ASSERT_EQUAL(size_t(2), field._scatters.size());
const Field<Mesh>::ScatterInfo& sinfoB = field._getScatter("B");
CPPUNIT_ASSERT(sinfoB.scatter);
@@ -1003,7 +1003,7 @@
field.allocate();
CPPUNIT_ASSERT_EQUAL(size_t(0), field._scatters.size());
- field.createScatter();
+ field.createScatter(mesh);
CPPUNIT_ASSERT_EQUAL(size_t(1), field._scatters.size());
const Field<Mesh>::ScatterInfo& sinfo = field._getScatter("");
CPPUNIT_ASSERT(sinfo.scatter);
@@ -1061,7 +1061,7 @@
section->updatePoint(*v_iter, &values[0]);
} // for
- field.createScatter(context);
+ field.createScatter(mesh, context);
field.scatterSectionToVector(context);
const PetscVec vec = field.vector(context);
CPPUNIT_ASSERT(0 != vec);
@@ -1102,7 +1102,7 @@
const ALE::Obj<Mesh::SieveMesh::label_sequence>& vertices =
sieveMesh->depthStratum(0);
- field.createScatter(context);
+ field.createScatter(mesh, context);
const PetscVec vec = field.vector(context);
CPPUNIT_ASSERT(0 != vec);
int size = 0;
@@ -1117,7 +1117,7 @@
valuesVec[i] = valuesE[i];
VecRestoreArray(vec, &valuesVec);
- field.createScatter(context);
+ field.createScatter(mesh, context);
field.scatterVectorToSection(context);
double_array values(fiberDim);
Modified: short/3D/PyLith/branches/v1.6-stable/unittests/libtests/topology/TestFieldSubMesh.cc
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/unittests/libtests/topology/TestFieldSubMesh.cc 2011-08-17 12:37:42 UTC (rev 18834)
+++ short/3D/PyLith/branches/v1.6-stable/unittests/libtests/topology/TestFieldSubMesh.cc 2011-08-18 20:52:50 UTC (rev 18835)
@@ -714,7 +714,7 @@
const int sizeE = vertices->size() * fiberDim;
CPPUNIT_ASSERT_EQUAL(size_t(0), field._scatters.size());
- field.createScatter();
+ field.createScatter(submesh);
CPPUNIT_ASSERT_EQUAL(size_t(1), field._scatters.size());
const Field<SubMesh>::ScatterInfo& sinfo = field._getScatter("");
CPPUNIT_ASSERT(sinfo.scatter);
@@ -726,11 +726,11 @@
CPPUNIT_ASSERT_EQUAL(sizeE, size);
// Make sure we can do multiple calls to createScatter().
- field.createScatter();
+ field.createScatter(submesh);
CPPUNIT_ASSERT_EQUAL(size_t(1), field._scatters.size());
// Create another scatter.
- field.createScatter("B");
+ field.createScatter(submesh, "B");
CPPUNIT_ASSERT_EQUAL(size_t(2), field._scatters.size());
const Field<SubMesh>::ScatterInfo& sinfoB = field._getScatter("B");
CPPUNIT_ASSERT(sinfoB.scatter);
@@ -774,7 +774,7 @@
const int sizeE = vertices->size() * fiberDim;
CPPUNIT_ASSERT_EQUAL(size_t(0), field._scatters.size());
- field.createScatterWithBC();
+ field.createScatterWithBC(submesh);
CPPUNIT_ASSERT_EQUAL(size_t(1), field._scatters.size());
const Field<SubMesh>::ScatterInfo& sinfo = field._getScatter("");
CPPUNIT_ASSERT(sinfo.scatter);
@@ -786,11 +786,11 @@
CPPUNIT_ASSERT_EQUAL(sizeE, size);
// Make sure we can do multiple calls to createScatterWithBC().
- field.createScatterWithBC();
+ field.createScatterWithBC(submesh);
CPPUNIT_ASSERT_EQUAL(size_t(1), field._scatters.size());
// Create another scatter.
- field.createScatterWithBC("B");
+ field.createScatterWithBC(submesh, "B");
CPPUNIT_ASSERT_EQUAL(size_t(2), field._scatters.size());
const Field<SubMesh>::ScatterInfo& sinfoB = field._getScatter("B");
CPPUNIT_ASSERT(sinfoB.scatter);
@@ -828,7 +828,7 @@
field.allocate();
CPPUNIT_ASSERT_EQUAL(size_t(0), field._scatters.size());
- field.createScatter();
+ field.createScatter(submesh);
CPPUNIT_ASSERT_EQUAL(size_t(1), field._scatters.size());
const Field<SubMesh>::ScatterInfo& sinfo = field._getScatter("");
CPPUNIT_ASSERT(sinfo.scatter);
@@ -883,7 +883,7 @@
section->updatePoint(*v_iter, &values[0]);
} // for
- field.createScatter(context);
+ field.createScatter(submesh, context);
field.scatterSectionToVector(context);
const PetscVec vec = field.vector(context);
CPPUNIT_ASSERT(0 != vec);
@@ -919,7 +919,7 @@
Field<SubMesh> field(submesh);
field.newSection(FieldBase::VERTICES_FIELD, fiberDim);
field.allocate();
- field.createScatter(context);
+ field.createScatter(submesh, context);
const ALE::Obj<SubMesh::SieveMesh>& sieveMesh = submesh.sieveMesh();
CPPUNIT_ASSERT(!sieveMesh.isNull());
More information about the CIG-COMMITS
mailing list