Changeset 5742 for anuga_work/development/anuga_1d/util_ext.h

Timestamp:

Sep 6, 2008, 4:30:16 PM (15 years ago)

Author:

steve

Message:

Found error in get_python_double

File:

• anuga_work/development/anuga_1d/util_ext.h (modified) (4 diffs)

anuga_work/development/anuga_1d/util_ext.h

@@ -279 +279 @@
 }
 
+
+
 double get_python_double(PyObject *O, char *name) {
   PyObject *TObject;
+  #define BUFFER_SIZE 80
+  char buf[BUFFER_SIZE];
   double tmp;
+  int n;
   
 
@@ -287 +292 @@
   TObject = PyObject_GetAttrString(O, name);
   if (!TObject) {
-    PyErr_SetString(PyExc_RuntimeError, "util_ext.h: get_python_double could not obtain double from object");
+        n =  snprintf(buf, BUFFER_SIZE, "util_ext.h: get_python_double could not obtain double %s.\n", name);
+        //printf("name = %s",name);
+    PyErr_SetString(PyExc_RuntimeError, buf);
+
     return 0.0;
   }  
@@ -298 +306 @@
 }
 
+
+
+
 int get_python_integer(PyObject *O, char *name) {
   PyObject *TObject;
-  int tmp;
+  #define BUFFER_SIZE 80
+  char buf[BUFFER_SIZE];
+  long tmp;
+  int n;
   
 
@@ -306 +320 @@
   TObject = PyObject_GetAttrString(O, name);
   if (!TObject) {
-    PyErr_SetString(PyExc_RuntimeError, "util_ext.h: get_python_integer could not obtain double from object");
+        n =  snprintf(buf, BUFFER_SIZE, "util_ext.h: get_python_integer could not obtain double %s.\n", name);
+        //printf("name = %s",name);
+    PyErr_SetString(PyExc_RuntimeError, buf);
     return 0;
   }  
   
-  tmp = PyFloat_AsDouble(TObject);
+  tmp = PyInt_AsLong(TObject);
   
   Py_DECREF(TObject);