[cig-commits] r17198 - short/3D/PyLith/trunk/playpen/closure

[brad at geodynamics.org]

Author: brad
Date: 2010-09-16 15:57:09 -0700 (Thu, 16 Sep 2010)
New Revision: 17198

Modified:
   short/3D/PyLith/trunk/playpen/closure/TestClosure.cc
Log:
Update test to use FieldsNew.

Modified: short/3D/PyLith/trunk/playpen/closure/TestClosure.cc
===================================================================
--- short/3D/PyLith/trunk/playpen/closure/TestClosure.cc	2010-09-16 05:57:34 UTC (rev 17197)
+++ short/3D/PyLith/trunk/playpen/closure/TestClosure.cc	2010-09-16 22:57:09 UTC (rev 17198)
@@ -130,22 +130,20 @@
 
 #else
   // Create fields
-  pylith::topology::SolutionFields fields(mesh);
-  fields.add("field AB", "field_AB");
-  topology::Field<topology::Mesh>& fieldAB = fields.get("field AB");
-  fieldAB.newSection(topology::FieldBase::VERTICES_FIELD, 2*spaceDim);
-  fieldAB.allocate();
-  fieldAB.zero();
-  fields.copyLayout("field AB");
+  pylith::topology::FieldsNew fields(mesh);
+  fields.add("field A", "displacement", spaceDim, topology::FieldBase::VECTOR);
+  fields.add("field B", "velocity", spaceDim, topology::FieldBase::VECTOR);
+  fields.allocate(topology::FieldBase::VERTICES_FIELD, 2*spaceDim);
 
   // Create field visitors
-  double_array fieldABCell(coneSize*2*spaceDim);
-  const ALE::Obj<RealSection>& fieldABSection = fields.get("field AB").section();
-  assert(!fieldABSection.isNull());
-  topology::Mesh::RestrictVisitor fieldABVisitor(*fieldABSection,
-						 fieldABCell.size(),
-						&fieldABCell[0]);
+  double_array fieldsCell(coneSize*2*spaceDim);
+  const ALE::Obj<RealUniformSection>fieldsSection = fields.section();
   
+  assert(!fieldsSection.isNull());
+  topology::Mesh::RestrictVisitor fieldABVisitor(*fieldsSection,
+						 fieldsCell.size(),
+						 &fieldsCell[0]);
+  
   double_array tmpCell(coneSize*2*spaceDim);
 #endif
   const int dataSize = coneSize * spaceDim;
@@ -175,8 +173,8 @@
       // Perform trivial operation on fields
       //tmpCell = fieldACell + fieldBCell + coordsCell;
 #else
-      fieldABVisitor.clear();
-      sieveMesh->restrictClosure(*c_iter, fieldABVisitor);
+      fieldsVisitor.clear();
+      sieveMesh->restrictClosure(*c_iter, fieldsVisitor);
       
       // Perform trivial operation on fields
       //for (int i=0; i < dataSize; ++i)