[cig-commits] r22020 - in short/3D/PyLith/trunk/libsrc/pylith: meshio topology

[brad at geodynamics.org]

Author: brad
Date: 2013-05-09 16:46:43 -0700 (Thu, 09 May 2013)
New Revision: 22020

Modified:
   short/3D/PyLith/trunk/libsrc/pylith/meshio/DataWriterHDF5.cc
   short/3D/PyLith/trunk/libsrc/pylith/topology/Field.cc
Log:
Improve variable name (field -> coordinatesField).

Modified: short/3D/PyLith/trunk/libsrc/pylith/meshio/DataWriterHDF5.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/meshio/DataWriterHDF5.cc	2013-05-09 23:24:10 UTC (rev 22019)
+++ short/3D/PyLith/trunk/libsrc/pylith/meshio/DataWriterHDF5.cc	2013-05-09 23:46:43 UTC (rev 22020)
@@ -120,10 +120,10 @@
     err = DMGetCoordinateDM(dmMesh, &dmCoord);PYLITH_CHECK_ERROR(err);assert(dmCoord);
     err = PetscObjectReference((PetscObject) dmCoord);PYLITH_CHECK_ERROR(err);
     err = DMGetCoordinatesLocal(dmMesh, &coordinates);PYLITH_CHECK_ERROR(err);
-    topology::Field<mesh_type> field(mesh, dmCoord, coordinates, metadata);
-    field.createScatterWithBC(mesh, "", 0, metadata.label.c_str());
-    field.scatterSectionToVector(metadata.label.c_str());
-    PetscVec coordVector = field.vector(metadata.label.c_str());assert(coordVector);
+    topology::Field<mesh_type> coordinatesField(mesh, dmCoord, coordinates, metadata);
+    coordinatesField.createScatterWithBC(mesh, "", 0, metadata.label.c_str());
+    coordinatesField.scatterSectionToVector(metadata.label.c_str());
+    PetscVec coordVector = coordinatesField.vector(metadata.label.c_str());assert(coordVector);
     err = VecScale(coordVector, lengthScale);PYLITH_CHECK_ERROR(err);
     err = PetscViewerHDF5PushGroup(_viewer, "/geometry");PYLITH_CHECK_ERROR(err);
     err = VecView(coordVector, _viewer);PYLITH_CHECK_ERROR(err);

Modified: short/3D/PyLith/trunk/libsrc/pylith/topology/Field.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/topology/Field.cc	2013-05-09 23:24:10 UTC (rev 22019)
+++ short/3D/PyLith/trunk/libsrc/pylith/topology/Field.cc	2013-05-09 23:46:43 UTC (rev 22020)
@@ -567,8 +567,7 @@
         err = VecSetFromOptions(sinfo.vector); PYLITH_CHECK_ERROR(err);  
       } else {
         sinfo.vector = _globalVec;
-        err = PetscObjectReference((PetscObject) sinfo.vector);
-        PYLITH_CHECK_ERROR(err);
+        err = PetscObjectReference((PetscObject) sinfo.vector);PYLITH_CHECK_ERROR(err);
       } // if/else
       err = PetscObjectSetName((PetscObject)sinfo.vector, _metadata["default"].label.c_str());PYLITH_CHECK_ERROR(err);