[cig-commits] r11955 - in short/3D/PyLith/trunk/libsrc: feassemble utils

[brad at geodynamics.org]

Author: brad
Date: 2008-05-12 09:58:02 -0700 (Mon, 12 May 2008)
New Revision: 11955

Modified:
   short/3D/PyLith/trunk/libsrc/feassemble/ElasticityImplicit.cc
   short/3D/PyLith/trunk/libsrc/utils/EventLogger.cc
Log:
Updated to reflect changes to names of function and order of arguments in Petsc*Event in petsc-dev.

Modified: short/3D/PyLith/trunk/libsrc/feassemble/ElasticityImplicit.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/ElasticityImplicit.cc	2008-05-12 12:56:10 UTC (rev 11954)
+++ short/3D/PyLith/trunk/libsrc/feassemble/ElasticityImplicit.cc	2008-05-12 16:58:02 UTC (rev 11955)
@@ -88,22 +88,22 @@
   assert(0 != fields);
   assert(!mesh.isNull());
 
-  static PetscEvent setupEvent = 0, cellGeomEvent = 0, stateVarsEvent = 0, restrictEvent = 0, computeEvent = 0, updateEvent = 0, stressEvent;
+  static PetscLogEvent setupEvent = 0, cellGeomEvent = 0, stateVarsEvent = 0, restrictEvent = 0, computeEvent = 0, updateEvent = 0, stressEvent;
 
   if (!setupEvent)
-    PetscLogEventRegister(&setupEvent, "IRSetup", 0);
+    PetscLogEventRegister("IRSetup", 0, &setupEvent);
   if (!cellGeomEvent)
-    PetscLogEventRegister(&cellGeomEvent, "IRCellGeom", 0);
+    PetscLogEventRegister("IRCellGeom", 0, &cellGeomEvent);
   if (!stateVarsEvent)
-    PetscLogEventRegister(&stateVarsEvent, "IRProperties", 0);
+    PetscLogEventRegister("IRProperties", 0, &stateVarsEvent);
   if (!restrictEvent)
-    PetscLogEventRegister(&restrictEvent, "IRRestrict", 0);
+    PetscLogEventRegister("IRRestrict", 0, &restrictEvent);
   if (!computeEvent)
-    PetscLogEventRegister(&computeEvent, "IRCompute", 0);
+    PetscLogEventRegister("IRCompute", 0, &computeEvent);
   if (!updateEvent)
-    PetscLogEventRegister(&updateEvent, "IRUpdate", 0);
+    PetscLogEventRegister("IRUpdate", 0, &updateEvent);
   if (!stressEvent)
-    PetscLogEventRegister(&stressEvent, "IRMaterialStress", 0);
+    PetscLogEventRegister("IRMaterialStress", 0, &stressEvent);
 
   const Obj<sieve_type>& sieve = mesh->getSieve();
 

Modified: short/3D/PyLith/trunk/libsrc/utils/EventLogger.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/utils/EventLogger.cc	2008-05-12 12:56:10 UTC (rev 11954)
+++ short/3D/PyLith/trunk/libsrc/utils/EventLogger.cc	2008-05-12 16:58:02 UTC (rev 11955)
@@ -41,7 +41,7 @@
 			   "initializaing EventLogger.");
   
   _events.clear();
-  PetscErrorCode err = PetscLogClassRegister(&_classId, _className.c_str());
+  PetscErrorCode err = PetscCookieRegister(_className.c_str(), &_classId);
   if (err) {
     std::ostringstream msg;
     msg << "Could not register logging class '" << _className << "'.";
@@ -57,7 +57,7 @@
 { // registerEvent
   assert(0 != _classId);
   int id = 0;
-  PetscErrorCode err = PetscLogEventRegister(&id, name, _classId);
+  PetscErrorCode err = PetscLogEventRegister(name, _classId, &id);
   if (err) {
     std::ostringstream msg;
     msg << "Could not register logging event '" << name