From 0ef49921712f74e756453556d75467398b68ccb1 Mon Sep 17 00:00:00 2001
From: Erik Schnetter <schnetter@aei.mpg.de>
Date: Sat, 25 Dec 2004 20:26:00 +0000
Subject: CarpetLib: Clean up fill_box_array function

Rename it to fill_bbox_array.
Declare it in a better place in the header file.
Make it not virtual.
Change pointer arguments to arrays.
Change hard-coded number 3 to D.

darcs-hash:20041225202612-891bb-e6249d004fdf0b3d8d24cbf8e5a4ae713786bdfb.gz
---
 Carpet/CarpetLib/src/data.cc | 20 ++++++++++----------
 Carpet/CarpetLib/src/data.hh |  9 ++++++---
 2 files changed, 16 insertions(+), 13 deletions(-)

(limited to 'Carpet')

diff --git a/Carpet/CarpetLib/src/data.cc b/Carpet/CarpetLib/src/data.cc
index ea07a3dcb..b1515b525 100644
--- a/Carpet/CarpetLib/src/data.cc
+++ b/Carpet/CarpetLib/src/data.cc
@@ -491,11 +491,11 @@ extern "C" {
 
 template<class T,int D>
 void data<T,D>
-::fill_box_arrays( int *srcshp, int *dstshp,
-	int srcbbox[3][D], int dstbbox[3][D], int regbbox[3][D],
-	const data<T,D>::ibbox & box,
-	const data<T,D>::ibbox & sext,
-	const data<T,D>::ibbox & dext )
+::fill_bbox_arrays (int srcshp[D], int dstshp[D],
+                    int srcbbox[D][D], int dstbbox[D][D], int regbbox[D][D],
+                    const data<T,D>::ibbox & box,
+                    const data<T,D>::ibbox & sext,
+                    const data<T,D>::ibbox & dext)
 {
   for (int d=0; d<D; ++d) {
     srcshp[d] = (sext.shape() / sext.stride())[d];
@@ -540,7 +540,7 @@ void data<CCTK_INT4,3>
   int srcshp[3], dstshp[3];
   int srcbbox[3][3], dstbbox[3][3], regbbox[3][3];
   
-  fill_box_arrays( srcshp, dstshp, srcbbox, dstbbox, regbbox,
+  fill_bbox_arrays( srcshp, dstshp, srcbbox, dstbbox, regbbox,
 	box, sext, dext );
   
   assert (all(dext.stride() == box.stride()));
@@ -583,7 +583,7 @@ void data<CCTK_REAL8,3>
   int srcshp[3], dstshp[3];
   int srcbbox[3][3], dstbbox[3][3], regbbox[3][3];
   
-  fill_box_arrays( srcshp, dstshp, srcbbox, dstbbox, regbbox,
+  fill_bbox_arrays( srcshp, dstshp, srcbbox, dstbbox, regbbox,
 	box, sext, dext );
   
   assert (all(dext.stride() == box.stride()));
@@ -626,7 +626,7 @@ void data<CCTK_COMPLEX16,3>
   int srcshp[3], dstshp[3];
   int srcbbox[3][3], dstbbox[3][3], regbbox[3][3];
   
-  fill_box_arrays( srcshp, dstshp, srcbbox, dstbbox, regbbox,
+  fill_bbox_arrays( srcshp, dstshp, srcbbox, dstbbox, regbbox,
 	box, sext, dext );
   
   assert (all(dext.stride() == box.stride()));
@@ -894,7 +894,7 @@ void data<T,D>
   int srcshp[3], dstshp[3];
   int srcbbox[3][3], dstbbox[3][3], regbbox[3][3];
   
-  fill_box_arrays( srcshp, dstshp, srcbbox, dstbbox, regbbox,
+  fill_bbox_arrays( srcshp, dstshp, srcbbox, dstbbox, regbbox,
 	box, sext, dext );
   
   switch (transport_operator) {
@@ -939,7 +939,7 @@ void data<T,D>
   int srcshp[3], dstshp[3];
   int srcbbox[3][3], dstbbox[3][3], regbbox[3][3];
   
-  fill_box_arrays( srcshp, dstshp, srcbbox, dstbbox, regbbox,
+  fill_bbox_arrays( srcshp, dstshp, srcbbox, dstbbox, regbbox,
 	box, sext, dext );
   switch (transport_operator) {
       
diff --git a/Carpet/CarpetLib/src/data.hh b/Carpet/CarpetLib/src/data.hh
index 9445bf165..f6a496bf0 100644
--- a/Carpet/CarpetLib/src/data.hh
+++ b/Carpet/CarpetLib/src/data.hh
@@ -87,9 +87,6 @@ private:
   virtual void change_processor_wait (comm_state<D>& state,
                                       const int newproc,
                                       void* const mem=0);
-  virtual void fill_box_arrays( int *srcshp, int *dstshp,
-        int srcbbox[3][D], int dstbbox[3][D], int regbbox[3][D],
-        const ibbox & box, const ibbox & sext, const ibbox & dext );
 public:
 
   // Accessors
@@ -118,6 +115,12 @@ public:
   }
   
   // Data manipulators
+private:
+  static void
+  fill_bbox_arrays (int srcshp[D], int dstshp[D],
+                    int srcbbox[D][D], int dstbbox[D][D], int regbbox[D][D],
+                    const ibbox & box, const ibbox & sext, const ibbox & dext);
+public:
   void copy_from_innerloop (const gdata<D>* gsrc,
 			    const ibbox& box);
   void interpolate_from_innerloop (const vector<const gdata<D>*> gsrcs,
-- 
cgit v1.2.3