Changeset 7762

Timestamp:

Jun 29, 2006, 3:05:58 PM (20 years ago)

Author:

Paul Price

Message:

Removing macros that copy vectors to static vectors.

File:

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

trunk/psLib/src/math/psConstants.h

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.89 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-30 01:03:53 $
+ *  @version $Revision: 1.90 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-30 01:05:58 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -361 +361 @@
 }\
 
-#define PS_VECTOR_CONVERT_F64_TO_F32_STATIC(OLD, NEW_PTR32, NEW_STATIC32) \
-if (OLD->type.type == PS_TYPE_F32) { \
-    NEW_PTR32 = (psVector *) OLD; \
-} else if (OLD->type.type == PS_TYPE_F64) { \
-    NEW_STATIC32 = psVectorRecycle(NEW_STATIC32, OLD->n, PS_TYPE_F32); \
-    p_psMemSetPersistent(NEW_STATIC32, true); \
-    p_psMemSetPersistent(NEW_STATIC32->data.U8, true); \
-    for (i=0; i < OLD->n ; i++) { \
-        NEW_STATIC32->data.F32[i] = (float) OLD->data.F64[i]; \
-    } \
-    NEW_PTR32 = NEW_STATIC32; \
-} \
-
-#define PS_VECTOR_CONVERT_F32_TO_F64_STATIC(OLD, NEW_PTR64, NEW_STATIC64) \
-if (OLD->type.type == PS_TYPE_F64) { \
-    NEW_PTR64 = (psVector *) OLD; \
-} else if (OLD->type.type == PS_TYPE_F32) { \
-    NEW_STATIC64 = psVectorRecycle(NEW_STATIC64, OLD->n, PS_TYPE_F64); \
-    p_psMemSetPersistent(NEW_STATIC64, true); \
-    p_psMemSetPersistent(NEW_STATIC64->data.U8, true); \
-    for (i=0; i < OLD->n ; i++) { \
-        NEW_STATIC64->data.F64[i] = (double) OLD->data.F32[i]; \
-    } \
-    NEW_PTR64 = NEW_STATIC64; \
-} \
-
-#define PS_VECTOR_GEN_YERR_STATIC_F32(VEC, N) \
-VEC = psVectorRecycle(VEC, N, PS_TYPE_F32); \
-p_psMemSetPersistent(VEC, true); \
-p_psMemSetPersistent(VEC->data.U8, true); \
-for (int i=0;i<N;i++) { \
-    VEC->data.F32[i] = 1.0; \
-} \
-
-#define PS_VECTOR_GEN_YERR_STATIC_F64(VEC, N) \
-VEC = psVectorRecycle(VEC, N, PS_TYPE_F64); \
-p_psMemSetPersistent(VEC, true); \
-p_psMemSetPersistent(VEC->data.U8, true); \
-for (int i=0;i<N;i++) { \
-    VEC->data.F64[i] = 1.0; \
-} \
-
-#define PS_VECTOR_GEN_X_INDEX_STATIC_F32(VEC, N) \
-VEC = psVectorRecycle(VEC, N, PS_TYPE_F32); \
-p_psMemSetPersistent(VEC, true); \
-p_psMemSetPersistent(VEC->data.U8, true); \
-for (int i=0;i<N;i++) { \
-    VEC->data.F32[i] = (float) i; \
-} \
-
-#define PS_VECTOR_GEN_X_INDEX_STATIC_F64(VEC, N) \
-VEC = psVectorRecycle(VEC, N, PS_TYPE_F64); \
-p_psMemSetPersistent(VEC, true); \
-p_psMemSetPersistent(VEC->data.U8, true); \
-for (int i=0;i<N;i++) { \
-    VEC->data.F64[i] = (float) i; \
-} \
-
-#define PS_VECTOR_GEN_STATIC_RECYCLED(NAME, SIZE, TYPE) \
-static psVector *NAME = NULL; \
-(NAME) = psVectorRecycle((NAME), SIZE, TYPE); \
-p_psMemSetPersistent((NAME), true); \
-p_psMemSetPersistent((NAME)->data.U8, true); \
-
-#define PS_VECTOR_DECLARE_ALLOC_STATIC(NAME, SIZE, TYPE) \
-static psVector *(NAME) = NULL; \
-if ((NAME) == NULL) { \
-    (NAME) = psVectorAlloc(SIZE, TYPE); \
-    p_psMemSetPersistent((NAME), true); \
-} \
-
 #define PS_VECTOR_SET_U8(NAME, VALUE) \
 for (int i = 0 ; i < (NAME)->n ; i++) { \