aboutsummaryrefslogtreecommitdiff
path: root/src/jtutil
diff options
context:
space:
mode:
authorjthorn <jthorn@f88db872-0e4f-0410-b76b-b9085cfa78c5>2003-03-12 20:03:19 +0000
committerjthorn <jthorn@f88db872-0e4f-0410-b76b-b9085cfa78c5>2003-03-12 20:03:19 +0000
commit0e8875795229f74faa7fd04d7f3fb248591b911b (patch)
tree9cd9077311bb395cc425eddfd74bba5286f7a3cf /src/jtutil
parent79bf4028b1ce360b3710ad7f2f6724e905437da2 (diff)
move 4D arrays (which we don't use in this thorn) inside #ifdef NOT_USED
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/AHFinderDirect/trunk@963 f88db872-0e4f-0410-b76b-b9085cfa78c5
Diffstat (limited to 'src/jtutil')
-rw-r--r--src/jtutil/array.cc11
-rw-r--r--src/jtutil/array.hh4
-rw-r--r--src/jtutil/test_array.cc8
3 files changed, 23 insertions, 0 deletions
diff --git a/src/jtutil/array.cc b/src/jtutil/array.cc
index c2f8d6c..554d900 100644
--- a/src/jtutil/array.cc
+++ b/src/jtutil/array.cc
@@ -10,8 +10,10 @@
// jtutil::array3d::array3d - 3D array template constructor
// jtutil::array3d::~array3d - 3D array template destructor
//
+#ifdef NOT_USED
// jtutil::array4d::array4d - 4D array template constructor
// jtutil::array4d::~array4d - 4D array template destructor
+#endif
//
// ***** template instantiations *****
//
@@ -229,6 +231,7 @@ if (we_own_array_)
//******************************************************************************
//******************************************************************************
+#ifdef NOT_USED
//
// This function constructs an array4d object.
//
@@ -290,9 +293,11 @@ if (we_own_array_)
}
}
} // namespace jtutil::
+#endif // NOT_USED
//******************************************************************************
+#ifdef NOT_USED
//
// This function destroys an array4d object.
//
@@ -305,6 +310,7 @@ if (we_own_array_)
then delete[] array_;
}
} // namespace jtutil::
+#endif // NOT_USED
//******************************************************************************
//******************************************************************************
@@ -325,13 +331,18 @@ template class jtutil::array1d<const void *>;
template class jtutil::array1d<float>;
template class jtutil::array2d<float>;
template class jtutil::array3d<float>;
+ #ifdef NOT_USED
template class jtutil::array4d<float>;
+ #endif
template class jtutil::array1d<double>;
template class jtutil::array2d<double>;
template class jtutil::array3d<double>;
+ #ifdef NOT_USED
template class jtutil::array4d<double>;
+ #endif
#else
+ // full-fledged Cactus thorn
template class jtutil::array1d<CCTK_REAL>;
template class jtutil::array2d<CCTK_INT>;
diff --git a/src/jtutil/array.hh b/src/jtutil/array.hh
index 04eba9c..bff4aa7 100644
--- a/src/jtutil/array.hh
+++ b/src/jtutil/array.hh
@@ -4,7 +4,9 @@
// array1d - 1D array template
// array2d - 2D array template
// array3d - 3D array template
+#ifdef NOT_USED
// array4d - 4D array template
+#endif
//
//
@@ -347,6 +349,7 @@ private:
//******************************************************************************
+#ifdef NOT_USED
namespace jtutil
{
template <typename T>
@@ -464,3 +467,4 @@ private:
// false ==> array_ --> client-owned storage
};
} // namespace jtutil::
+#endif // NOT_USED
diff --git a/src/jtutil/test_array.cc b/src/jtutil/test_array.cc
index dfca98e..c7a421a 100644
--- a/src/jtutil/test_array.cc
+++ b/src/jtutil/test_array.cc
@@ -13,7 +13,9 @@ using jtutil::fuzzy;
using jtutil::array1d;
using jtutil::array2d;
using jtutil::array3d;
+#ifdef NOT_USED
using jtutil::array4d;
+#endif
//
// prototypes for non-class functions defined in this file
@@ -21,7 +23,9 @@ using jtutil::array4d;
double test_array1d_double(bool fancy_storage, bool print_flag);
double test_array2d_float(bool fancy_storage, bool print_flag);
double test_array3d_double(bool fancy_storage, bool print_flag);
+#ifdef NOT_USED
double test_array4d_double(bool fancy_storage, bool print_flag);
+#endif
//******************************************************************************
@@ -46,8 +50,10 @@ sum_RMS_diff += test_array2d_float(true, print_flag);
sum_RMS_diff += test_array3d_double(false, print_flag);
sum_RMS_diff += test_array3d_double(true, print_flag);
+#ifdef NOT_USED
sum_RMS_diff += test_array4d_double(false, print_flag);
sum_RMS_diff += test_array4d_double(true, print_flag);
+#endif
printf("\n");
printf("grand total RMS_diff = %g\n", sum_RMS_diff);
@@ -451,6 +457,7 @@ return RMS_diff;
//******************************************************************************
+#ifdef NOT_USED
//
// This function tests the array4d<double> class.
//
@@ -618,3 +625,4 @@ if (fancy_storage)
return RMS_diff;
}
+#endif // NOT_USED