[cig-commits] r4439 - in short/3D/PyLith/branches/pylith-0.8/pylith3d: libpylith3d module pylith3d

[willic3 at geodynamics.org]

Author: willic3
Date: 2006-08-27 18:11:30 -0700 (Sun, 27 Aug 2006)
New Revision: 4439

Modified:
   short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/viscos_cleanup.F
   short/3D/PyLith/branches/pylith-0.8/pylith3d/module/pylith3d_externs.h
   short/3D/PyLith/branches/pylith-0.8/pylith3d/module/viscos.cc
   short/3D/PyLith/branches/pylith-0.8/pylith3d/pylith3d/Pylith3d_run.py
Log:
Altered routine, bindings and calls to include missing array (nprint).



Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/viscos_cleanup.F
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/viscos_cleanup.F	2006-08-26 22:39:41 UTC (rev 4438)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/libpylith3d/viscos_cleanup.F	2006-08-28 01:11:30 UTC (rev 4439)
@@ -29,7 +29,7 @@
 c
 c
       subroutine viscos_cleanup(
-     & ntimdat,nunits,                                                  ! timdat
+     & ntimdat,nprint,nunits,                                           ! timdat
      & ierr,errstrng)                                                   ! errcode
 c
 c     PETSC includes
@@ -49,11 +49,13 @@
 c...  included dimension and type statements
 c
       include "ntimdat_dim.inc"
+      include "nprint_dim.inc"
       include "nunits_dim.inc"
 c
 c...  included variable definitions
 c
       include "ntimdat_def.inc"
+      include "nprint_def.inc"
       include "nunits_def.inc"
 c
 c...  close units

Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/module/pylith3d_externs.h
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/module/pylith3d_externs.h	2006-08-26 22:39:41 UTC (rev 4438)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/module/pylith3d_externs.h	2006-08-28 01:11:30 UTC (rev 4439)
@@ -1042,6 +1042,7 @@
   void viscos_cleanup_f(int *,
                         int *,
                         int *,
+                        int *,
                         char *,
                         size_t);
 

Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/module/viscos.cc
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/module/viscos.cc	2006-08-26 22:39:41 UTC (rev 4438)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/module/viscos.cc	2006-08-28 01:11:30 UTC (rev 4439)
@@ -942,9 +942,10 @@
 PyObject * pypylith3d_viscos_cleanup(PyObject *, PyObject *args)
 {
   PyObject* pyPointerToListArrayNtimdat;
+  PyObject* pyPointerToListArrayNprint;
   PyObject* pyPointerToListArrayNunits;
 
-  int ok = PyArg_ParseTuple(args, "OO:viscos_cleanup",&pyPointerToListArrayNtimdat,&pyPointerToListArrayNunits);
+  int ok = PyArg_ParseTuple(args, "OOO:viscos_cleanup",&pyPointerToListArrayNtimdat, &pyPointerToListArrayNprint, &pyPointerToListArrayNunits);
 
   if (!ok) {
     return 0;
@@ -954,9 +955,11 @@
   const int maxsize = 4096;
   char errorstring[maxsize];
   int *pointerToListArrayNtimdat = (int *) PyCObject_AsVoidPtr(pyPointerToListArrayNtimdat);
+  int *pointerToListArrayNprint = (int *) PyCObject_AsVoidPtr(pyPointerToListArrayNprint);
   int *pointerToListArrayNunits  = (int *) PyCObject_AsVoidPtr(pyPointerToListArrayNunits);
 
   viscos_cleanup_f(pointerToListArrayNtimdat,
+                   pointerToListArrayNprint,
                    pointerToListArrayNunits,
                    &errorcode,                        // Error codes
                    errorstring,

Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/pylith3d/Pylith3d_run.py
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/pylith3d/Pylith3d_run.py	2006-08-26 22:39:41 UTC (rev 4438)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/pylith3d/Pylith3d_run.py	2006-08-28 01:11:30 UTC (rev 4439)
@@ -558,7 +558,7 @@
                 print " Total number of equilibrium iterations        =",pylith3d.intListRef(self.pointerToListArrayNtimdat, 5)
                 print " Total number of stiffness matrix reformations =",pylith3d.intListRef(self.pointerToListArrayNtimdat, 6)
                 print " Total number of displacement subiterations    =",pylith3d.intListRef(self.pointerToListArrayNtimdat, 7)
-                pylith3d.viscos_cleanup(self.pointerToListArrayNtimdat, self.pointerToListArrayNunits)
+                pylith3d.viscos_cleanup(self.pointerToListArrayNtimdat, self.pointerToListArrayNprint, self.pointerToListArrayNunits)
             else:
                 pylith3d.viscos(
                     self.A,self.rhs,self.sol,                          # sparse