Changeset 5517 for trunk/psLib/src/math/psConstants.h

Timestamp:

Nov 15, 2005, 10:10:32 AM (20 years ago)

Author:

gusciora

Message:

Bug fix for psSpline, some new psConstant macros, ....

File:

• trunk/psLib/src/math/psConstants.h (modified) (5 diffs)

trunk/psLib/src/math/psConstants.h

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.78 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-10-12 21:02:20 $
+ *  @version $Revision: 1.79 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-11-15 20:10:32 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -222 +222 @@
 the wrong type.
 *****************************************************************************/
+#define PS_WARN_PTR_NON_NULL(NAME) \
+if ((NAME) == NULL) { \
+    psLogMsg(__func__, PS_LOG_WARN, "WARNING: %s is NULL.", #NAME); \
+} \
+
 #define PS_ASSERT_PTR_NON_NULL(NAME, RVAL) PS_ASSERT_GENERAL_PTR_NON_NULL(NAME, return RVAL)
 #define PS_ASSERT_GENERAL_PTR_NON_NULL(NAME, CLEANUP) \
@@ -501 +506 @@
     PS_POLY macros:
 *****************************************************************************/
+#define PS_ASSERT_POLY1D(NAME, RVAL) \
+if (false == psMemCheckPolynomial1D(NAME)) { \
+    psError(PS_ERR_BAD_PARAMETER_NULL, true, \
+            "Unallowable operation: argument %s is not a psPolynomial1D struct.\n",\
+            #NAME); \
+    return(RVAL); \
+} \
+
 #define PS_ASSERT_POLY_NON_NULL(NAME, RVAL) \
 if ((NAME) == NULL || (NAME)->coeff == NULL) { \
@@ -582 +595 @@
     printf("%s->coeff[%d] is %f\n", #NAME, i, NAME->coeff[i]); \
 }\
+
+/*****************************************************************************
+    PS_SPLINE macros:
+*****************************************************************************/
+#define PS_ASSERT_SPLINE(NAME, RVAL) \
+if (false == psMemCheckSpline1D(NAME)) { \
+    psError(PS_ERR_BAD_PARAMETER_NULL, true, \
+            "Unallowable operation: argument %s is not a psSpline1D struct.\n",\
+            #NAME); \
+    return(RVAL); \
+} \
+
+#define PS_ASSERT_SPLINE_NON_NULL(NAME, RVAL) \
+if ((NAME) == NULL) { \
+    psError(PS_ERR_BAD_PARAMETER_NULL, true, \
+            "Unallowable operation: psSpline1D %s is NULL.", \
+            #NAME); \
+    return(RVAL); \
+} \
 
 /*****************************************************************************
@@ -755 +787 @@
 ((A) * (A))
 
+#define PRINT_MEMLEAKS(NUM) \
+printf("A: ---------------------------------------- (ID: %d)\n", NUM); \
+memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); \
+printf("B: ---------------------------------------- (%d)\n", memLeaks); \
+
 # define PS_SWAP(X,Y) {double tmp=(X); (X) = (Y); (Y) = tmp;}