Index: /trunk/psLib/src/mathtypes/psScalar.c
===================================================================
--- /trunk/psLib/src/mathtypes/psScalar.c	(revision 11696)
+++ /trunk/psLib/src/mathtypes/psScalar.c	(revision 11697)
@@ -8,6 +8,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-09 22:38:53 $
+ *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-08 02:42:46 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -31,10 +31,14 @@
 }
 
-psScalar* psScalarAlloc(double complex value, psElemType type)
+psScalar* p_psScalarAlloc(const char *file,
+                          unsigned int lineno,
+                          const char *func,
+                          double complex value,
+                          psElemType type)
 {
     psScalar* scalar = NULL;
 
     // Create scalar
-    scalar = (psScalar* ) psAlloc(sizeof(psScalar));
+    scalar = (psScalar* ) p_psAlloc(file, lineno, func, sizeof(psScalar));
     psMemSetDeallocator(scalar, (psFreeFunc)scalarFree);
     scalar->type.dimen = PS_DIMEN_SCALAR;
@@ -98,5 +102,8 @@
 
 
-psScalar* psScalarCopy(const psScalar *value)
+psScalar* p_psScalarCopy(const char *file,
+                       unsigned int lineno,
+                       const char *func,
+                       const psScalar *value)
 {
     psElemType dataType;
@@ -112,38 +119,38 @@
     switch (dataType) {
     case PS_TYPE_S8:
-        newScalar =  psScalarAlloc(value->data.S8, dataType);
+        newScalar =  p_psScalarAlloc(file, lineno, func, value->data.S8, dataType);
         break;
     case PS_TYPE_U8:
-        newScalar =  psScalarAlloc(value->data.U8, dataType);
+        newScalar =  p_psScalarAlloc(file, lineno, func, value->data.U8, dataType);
         break;
     case PS_TYPE_S16:
-        newScalar =  psScalarAlloc(value->data.S16, dataType);
+        newScalar =  p_psScalarAlloc(file, lineno, func, value->data.S16, dataType);
         break;
     case PS_TYPE_U16:
-        newScalar =  psScalarAlloc(value->data.U16, dataType);
+        newScalar =  p_psScalarAlloc(file, lineno, func, value->data.U16, dataType);
         break;
     case PS_TYPE_S32:
-        newScalar =  psScalarAlloc(value->data.S32, dataType);
+        newScalar =  p_psScalarAlloc(file, lineno, func, value->data.S32, dataType);
         break;
     case PS_TYPE_U32:
-        newScalar =  psScalarAlloc(value->data.U32, dataType);
+        newScalar =  p_psScalarAlloc(file, lineno, func, value->data.U32, dataType);
         break;
     case PS_TYPE_S64:
-        newScalar =  psScalarAlloc(value->data.S64, dataType);
+        newScalar =  p_psScalarAlloc(file, lineno, func, value->data.S64, dataType);
         break;
     case PS_TYPE_U64:
-        newScalar =  psScalarAlloc(value->data.U64, dataType);
+        newScalar =  p_psScalarAlloc(file, lineno, func, value->data.U64, dataType);
         break;
     case PS_TYPE_F32:
-        newScalar =  psScalarAlloc(value->data.F32, dataType);
+        newScalar =  p_psScalarAlloc(file, lineno, func, value->data.F32, dataType);
         break;
     case PS_TYPE_F64:
-        newScalar =  psScalarAlloc(value->data.F64, dataType);
+        newScalar =  p_psScalarAlloc(file, lineno, func, value->data.F64, dataType);
         break;
     case PS_TYPE_C32:
-        newScalar =  psScalarAlloc(value->data.C32, dataType);
+        newScalar =  p_psScalarAlloc(file, lineno, func, value->data.C32, dataType);
         break;
     case PS_TYPE_C64:
-        newScalar =  psScalarAlloc(value->data.C64, dataType);
+        newScalar =  p_psScalarAlloc(file, lineno, func, value->data.C64, dataType);
         break;
     default:
Index: /trunk/psLib/src/mathtypes/psScalar.h
===================================================================
--- /trunk/psLib/src/mathtypes/psScalar.h	(revision 11696)
+++ /trunk/psLib/src/mathtypes/psScalar.h	(revision 11697)
@@ -6,7 +6,8 @@
  *
  * @author Ross Harman, MHPCC
+ * @author Joshua Hoblitt, University of Hawaii
  *
- * @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-01-23 22:47:23 $
+ * @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-02-08 02:42:46 $
  * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
@@ -60,8 +61,20 @@
  * @return psScalar*   Pointer to a new psScalar.
  */
+#ifdef DOXYGEN
 psScalar* psScalarAlloc(
-    double complex value,              ///< Data to be put into psScalar.
-    psElemType type                    ///< Type of data to be held by psScalar.
+    double complex value,               ///< Data to be put into psScalar
+    psElemType type                     ///< Type of data to be held by psScalar
 );
+#else // ifdef DOXYGEN
+psScalar* p_psScalarAlloc(
+    const char *file,                   ///< File of caller
+    unsigned int lineno,                ///< Line number of caller
+    const char *func,                   ///< Function name of caller
+    double complex value,               ///< Data to be put into psScalar
+    psElemType type                     ///< Type of data to be held by psScalar
+);
+#define psScalarAlloc(value, type) \
+      p_psScalarAlloc(__FILE__, __LINE__, __func__, value, type)
+#endif // ifdef DOXYGEN
 
 
@@ -83,7 +96,19 @@
  * @return psScalar*    A copy of the input scalar
  */
+#ifdef DOXYGEN
 psScalar* psScalarCopy(
-    const psScalar *value              ///< Scalar to copy.
+    const psScalar *value               ///< Scalar to copy
 );
+#else // ifdef DOXYGEN
+psScalar* p_psScalarCopy(
+    const char *file,                   ///< File of caller
+    unsigned int lineno,                ///< Line number of caller
+    const char *func,                   ///< Function name of caller
+    const psScalar *value               ///< Scalar to copy.
+);
+#define psScalarCopy(value) \
+      p_psScalarCopy(__FILE__, __LINE__, __func__, value)
+#endif // ifdef DOXYGEN
+
 
 /// @}
Index: /trunk/psLib/src/mathtypes/psVector.c
===================================================================
--- /trunk/psLib/src/mathtypes/psVector.c	(revision 11696)
+++ /trunk/psLib/src/mathtypes/psVector.c	(revision 11697)
@@ -8,7 +8,8 @@
 *  @author Ross Harman, MHPCC
 *  @author Robert DeSonia, MHPCC
+*  @author Joshua Hoblitt, University of Hawaii
 *
-*  @version $Revision: 1.92 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-02-08 02:31:59 $
+*  @version $Revision: 1.93 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2007-02-08 02:42:46 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
Index: /trunk/psLib/src/mathtypes/psVector.h
===================================================================
--- /trunk/psLib/src/mathtypes/psVector.h	(revision 11696)
+++ /trunk/psLib/src/mathtypes/psVector.h	(revision 11697)
@@ -8,7 +8,8 @@
  * @author Robert DeSonia, MHPCC
  * @author Ross Harman, MHPCC
- *
- * @version $Revision: 1.63 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-02-08 02:31:59 $
+ * @author Joshua Hoblitt, University of Hawaii
+ *
+ * @version $Revision: 1.64 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-02-08 02:42:46 $
  * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */