[cig-commits] r5053 - short/3D/PyLith/branches/pylith-0.8/pylith3d/module

[knepley at geodynamics.org]

Author: knepley
Date: 2006-10-15 17:13:47 -0700 (Sun, 15 Oct 2006)
New Revision: 5053

Modified:
   short/3D/PyLith/branches/pylith-0.8/pylith3d/module/scanner.cc
Log:
Finally running with new PETSc


Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/module/scanner.cc
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/module/scanner.cc	2006-10-15 23:27:11 UTC (rev 5052)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/module/scanner.cc	2006-10-16 00:13:47 UTC (rev 5053)
@@ -306,10 +306,13 @@
   if (m->debug()) {
     s->view("Displacement field");
   }
+  m->getRealSection("displacement")->view("Displacement field");
+  m->getRealSection("default")->view("Default field");
+  m->getRealSection("default")->setDebug(1);
   ierr = SectionRealDestroy(section);
   debug << journal::at(__HERE__) << "[" << rank << "]Created displacement Field"  << journal::endl;
 
-  m->getFactory()->constructInverseOrder(m->getFactory()->getLocalNumbering(m->getTopology(), 0, 0));
+  m->getFactory()->constructInverseOrder(m->getFactory()->getLocalNumbering(m->getTopology(), 0, m->getTopology()->depth()));
 
   // return
   PyObject *pyMesh = PyCObject_FromVoidPtr(mesh, NULL);
@@ -370,24 +373,13 @@
     return 0;
   }
 
-  PetscObjectContainer c;
+  ierr = PetscObjectCompose((PetscObject) A, "mesh", (PetscObject) mesh);
 
-  ierr = PetscObjectContainerCreate(comm, &c);
-  ierr = PetscObjectContainerSetPointer(c, mesh);
-  ierr = PetscObjectCompose((PetscObject) A, "mesh", (PetscObject) c);
-  ierr = PetscObjectContainerDestroy(c);
-
   VecScatter injection = NULL;
   ierr = MeshGetGlobalScatter(mesh, &injection);
-  ierr = PetscObjectContainerCreate(comm, &c);
-  ierr = PetscObjectContainerSetPointer(c, mesh);
-  ierr = PetscObjectCompose((PetscObject) rhs, "mesh", (PetscObject) c);
-  ierr = PetscObjectContainerDestroy(c);
+  ierr = PetscObjectCompose((PetscObject) rhs, "mesh",      (PetscObject) mesh);
   ierr = PetscObjectCompose((PetscObject) rhs, "injection", (PetscObject) injection);
-  ierr = PetscObjectContainerCreate(comm, &c);
-  ierr = PetscObjectContainerSetPointer(c, mesh);
-  ierr = PetscObjectCompose((PetscObject) sol, "mesh", (PetscObject) c);
-  ierr = PetscObjectContainerDestroy(c);
+  ierr = PetscObjectCompose((PetscObject) sol, "mesh",      (PetscObject) mesh);
   ierr = PetscObjectCompose((PetscObject) sol, "injection", (PetscObject) injection);
 
   ierr = MatSetFromOptions(A);