aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjthorn <jthorn@f88db872-0e4f-0410-b76b-b9085cfa78c5>2002-04-10 12:42:14 +0000
committerjthorn <jthorn@f88db872-0e4f-0410-b76b-b9085cfa78c5>2002-04-10 12:42:14 +0000
commite9aaf42eedcda6b0f7dd2d6ce44b265377b928de (patch)
treede3d6e2a65eb8072b4293e14aec50015da61dd80
parent6246b68fd99f8776e9c42e474e9bcc12d6666188 (diff)
rename patch_frontier --> patch_interp everywhere
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/AHFinderDirect/trunk@475 f88db872-0e4f-0410-b76b-b9085cfa78c5
-rw-r--r--src/patch/README2
-rw-r--r--src/patch/ghost_zone.cc12
-rw-r--r--src/patch/ghost_zone.hh24
-rw-r--r--src/patch/make.code.defn2
-rw-r--r--src/patch/patch.cc40
-rw-r--r--src/patch/patch.hh44
-rw-r--r--src/patch/patch_system.cc2
-rw-r--r--src/patch/patch_system.hh2
-rw-r--r--src/patch/test_patch_system.cc2
9 files changed, 65 insertions, 65 deletions
diff --git a/src/patch/README b/src/patch/README
index 9b3f980..31d43a2 100644
--- a/src/patch/README
+++ b/src/patch/README
@@ -27,7 +27,7 @@ interpatch_ghost_zone
symmetry_ghost_zone
represents a ghost zone where we get data by a discrete
symmetry (eg a reflection or periodic boundary condition).
-patch_frontier
+patch_interp
is our interface to the interpatch interpolation.
Class patch is in term implemented using the following helper classes:
diff --git a/src/patch/ghost_zone.cc b/src/patch/ghost_zone.cc
index 5b3454e..0b844ab 100644
--- a/src/patch/ghost_zone.cc
+++ b/src/patch/ghost_zone.cc
@@ -38,7 +38,7 @@ using jtutil::error_exit;
#include "patch.hh"
#include "patch_edge.hh"
#include "ghost_zone.hh"
-#include "patch_frontier.hh"
+#include "patch_interp.hh"
//******************************************************************************
//******************************************************************************
@@ -378,10 +378,10 @@ return max_par_adjacent_ghost_zone().is_symmetry()
// object. It
// - sets up the par coordinate mapping information
// - sets up the interpolator data pointer and result arrays
-// - constructs the *other* patch's patch_frontier:: object
+// - constructs the *other* patch's patch_interp:: object
// and sets our patch frontier pointer to point to it
//
-// We use our ipar as the patch_frontier's parindex.
+// We use our ipar as the patch_interp's parindex.
//
void interpatch_ghost_zone::finish_setup(int interp_handle,
int interp_par_table_handle)
@@ -393,7 +393,7 @@ const int other_max_iperp = std::max(other_iperp(min_iperp()),
//
// set up arrays giving [min,max] ipar that we'll use at each other_iperp
// ... we will pass these arrays by reference to the other patch's
-// patch_frontier object, with ipar being parindex there
+// patch_interp object, with ipar being parindex there
//
min_ipar_used_ = new jtutil::array1d<int>(other_min_iperp, other_max_iperp);
max_ipar_used_ = new jtutil::array1d<int>(other_min_iperp, other_max_iperp);
@@ -454,12 +454,12 @@ interp_result_buffer_
//
// construct and link to the *other* patch's frontier
//
-other_frontier_ = new patch_frontier(other_edge(),
+other_frontier_ = new patch_interp(other_edge(),
other_min_iperp, other_max_iperp,
*min_ipar_used_, *max_ipar_used_,
*other_par_,
interp_handle, interp_par_table_handle);
-other_patch().set_patch_frontier(other_edge(), other_frontier_);
+other_patch().set_patch_interp(other_edge(), other_frontier_);
}
diff --git a/src/patch/ghost_zone.hh b/src/patch/ghost_zone.hh
index 141c75d..e8f7a49 100644
--- a/src/patch/ghost_zone.hh
+++ b/src/patch/ghost_zone.hh
@@ -44,7 +44,7 @@
// overlaps another patch. Such an object knows how to get ghost
// zone gridfn data from the other patch. More accurately, it gets
// the data by asking (calling) the appropriate one of the other
-// patch's patch_frontier objects.
+// patch's patch_interp objects.
// Every patch has (points to) 4 ghost_zone objects, one for each of
// the patch's sides. See the comments in "patch.hh" for a "big picture"
// discussion of patches, patch edges, ghost zones, and patch frontiers.
@@ -190,7 +190,7 @@
// interpatch_ghost_zone objects.
// [At present we require all points in a given ghost zone
// to be interpolated from the same neighboring patch and
-// patch_frontier object, so must arbitrarily choose one
+// patch_interp object, so must arbitrarily choose one
// of the two neighbors for the diagonal points. In theory
// it would be better to take the average of the two neighbors,
// but in practice this doesn't matter for horizon finding
@@ -453,7 +453,7 @@ private:
//
// A ghost_zone object maps (my_iperp,my_ipar) coordinates to the other
// patch's (other_iperp,other_par) coordinates, then calls the other patch's
-// patch_frontier object to interpolate the other patch's data to those
+// patch_interp object to interpolate the other patch's data to those
// coordinates.
//
// Note const qualifiers refer to the data stored by
@@ -471,7 +471,7 @@ private:
// and interpolation result buffer [this is done by finish_setup() ]
//
-class patch_frontier;
+class patch_interp;
class interpatch_ghost_zone
: public ghost_zone
@@ -542,9 +542,9 @@ private:
// finish_setup()
//
- // see comment in "patch_frontier.hh" for why this is "const"
+ // see comment in "patch_interp.hh" for why this is "const"
// n.b. we do *not* own this object (the other patch does)!
- const patch_frontier* other_frontier_;
+ const patch_interp* other_frontier_;
// other patch's iperp coordinates of our ghost zone points
// ... maps my_iperp --> other_iperp
@@ -552,23 +552,23 @@ private:
// [min,max]_ipar used at each other_iperp
// ... we will pass these arrays by reference
- // to the other patch's patch_frontier object
+ // to the other patch's patch_interp object
// ... index is (other_iperp)
jtutil::array1d<int>* min_ipar_used_;
jtutil::array1d<int>* max_ipar_used_;
// other patch's (fp) parallel coordinates of our ghost zone points
// ... we will pass this array by reference
- // to the other patch's patch_frontier object
- // using my_ipar as the patch_frontier's parindex
+ // to the other patch's patch_interp object
+ // using my_ipar as the patch_interp's parindex
// ... subscripts are (other_iperp, my_ipar)
jtutil::array2d<fp>* other_par_;
- // buffer into which the other patch's patch_frontier object
+ // buffer into which the other patch's patch_interp object
// will store the interpolated gridfn values
// ... we will pass this array by reference
- // to the other patch's patch_frontier object
- // using my_ipar as the patch_frontier's parindex
+ // to the other patch's patch_interp object
+ // using my_ipar as the patch_interp's parindex
// ... subscripts are (gfn, other_iperp,my_ipar)
jtutil::array3d<fp>* interp_result_buffer_;
};
diff --git a/src/patch/make.code.defn b/src/patch/make.code.defn
index 7380ee8..cd95b02 100644
--- a/src/patch/make.code.defn
+++ b/src/patch/make.code.defn
@@ -7,7 +7,7 @@ SRCS = coords.cc \
fd_grid.cc \
patch.cc \
ghost_zone.cc \
- patch_frontier.cc \
+ patch_interp.cc \
patch_system.cc \
test_patch_system.cc
diff --git a/src/patch/patch.cc b/src/patch/patch.cc
index 7f27bf3..46493f7 100644
--- a/src/patch/patch.cc
+++ b/src/patch/patch.cc
@@ -45,7 +45,7 @@ using jtutil::error_exit;
#include "patch.hh"
#include "patch_edge.hh"
#include "ghost_zone.hh"
-#include "patch_frontier.hh"
+#include "patch_interp.hh"
//******************************************************************************
//******************************************************************************
@@ -85,10 +85,10 @@ patch::patch(patch_system &my_patch_system_in, int patch_number_in,
min_sigma_ghost_zone_(NULL),
max_sigma_ghost_zone_(NULL),
- min_rho_patch_frontier_(NULL),
- max_rho_patch_frontier_(NULL),
- min_sigma_patch_frontier_(NULL),
- max_sigma_patch_frontier_(NULL) // no comma
+ min_rho_patch_interp_(NULL),
+ max_rho_patch_interp_(NULL),
+ min_sigma_patch_interp_(NULL),
+ max_sigma_patch_interp_(NULL) // no comma
{ }
@@ -106,10 +106,10 @@ delete min_sigma_ghost_zone_;
delete max_rho_ghost_zone_;
delete min_rho_ghost_zone_;
-delete max_sigma_patch_frontier_;
-delete min_sigma_patch_frontier_;
-delete max_rho_patch_frontier_;
-delete min_rho_patch_frontier_;
+delete max_sigma_patch_interp_;
+delete min_sigma_patch_interp_;
+delete max_rho_patch_interp_;
+delete min_rho_patch_interp_;
delete & max_sigma_patch_edge_;
delete & min_sigma_patch_edge_;
@@ -300,22 +300,22 @@ ghost_zone_ptr_to_set = gzp;
//
// This is a helper function for (our friend)
-// interpatch_ghost_zone::setup_other_patch_frontier().
+// interpatch_ghost_zone::setup_other_patch_interp().
// This function assert()s that one of the patch frontier pointers
// (which one is selected by edge ) is NULL, then stores a value in it.
//
-void patch::set_patch_frontier(const patch_edge& edge,
- const patch_frontier* pfp)
+void patch::set_patch_interp(const patch_edge& edge,
+ const patch_interp* pfp)
const
{
-const patch_frontier*& patch_frontier_ptr_to_set
- = edge.is_min() ? (edge.is_rho() ? min_rho_patch_frontier_
- : min_sigma_patch_frontier_)
- : (edge.is_rho() ? max_rho_patch_frontier_
- : max_sigma_patch_frontier_);
-
-assert(patch_frontier_ptr_to_set == NULL);
-patch_frontier_ptr_to_set = pfp;
+const patch_interp*& patch_interp_ptr_to_set
+ = edge.is_min() ? (edge.is_rho() ? min_rho_patch_interp_
+ : min_sigma_patch_interp_)
+ : (edge.is_rho() ? max_rho_patch_interp_
+ : max_sigma_patch_interp_);
+
+assert(patch_interp_ptr_to_set == NULL);
+patch_interp_ptr_to_set = pfp;
}
//******************************************************************************
diff --git a/src/patch/patch.hh b/src/patch/patch.hh
index 616c875..0b7d8fe 100644
--- a/src/patch/patch.hh
+++ b/src/patch/patch.hh
@@ -57,16 +57,16 @@
// overlaps another patch. Such an object knows how to get ghost
// zone gridfn data from the other patch. More accurately, it gets
// the data by asking (calling) the appropriate one of the other
-// patch's patch_frontier objects.
+// patch's patch_interp objects.
// Every patch has (points to) 4 ghost_zone objects, one for each of
// the patch's sides.
//
-// A patch_frontier object represents the part of a patch *inside*
+// A patch_interp object represents the part of a patch *inside*
// its nominal grid from which data is interpolated to compute gridfns
-// in another patch's ghost zone. A patch_frontier object stores
+// in another patch's ghost zone. A patch_interp object stores
// information about the interpolator (which interpolator to use, any
// options for it) and any cached data for the interpolator. Every
-// patch has (points to) between 0 and 4 patch_frontier objects,
+// patch has (points to) between 0 and 4 patch_interp objects,
// one for each of the patch's sides where there's an adjacent patch
// and thus from which interpolation is done.
//
@@ -75,14 +75,14 @@
// this (omitting the patch_edge objects for simplicity):
//
// +-----+ +-----+
-// | | <--> p.interpatch_ghost_zone --> q.patch_frontier <--> | |
+// | | <--> p.interpatch_ghost_zone --> q.patch_interp <--> | |
// | p | | q |
-// | | <--> p.patch_frontier <-- q.interpatch_ghost_zone <--> | |
+// | | <--> p.patch_interp <-- q.interpatch_ghost_zone <--> | |
// +-----+ +-----+
//
// Because of the mutual pointers, we can't easily construct (say)
// p's interpatch_ghost_zone until after q itself has been constructed,
-// and vice versa. Moreover, the patch_frontier:: constructor
+// and vice versa. Moreover, the patch_interp:: constructor
// needs the adjacent-side ghost_zone objects to already exist,
// and it needs to know the iperp range of the frontier, which can
// only be computed from the adjacent-patch interpatch_ghost_zone
@@ -101,9 +101,9 @@
// * The patch_system constructor calls the functions
// interpatch_ghost_zone::finish_setup()
// to finish setting up the interpatch_ghost_zone objects, construct
-// the patch_frontier objects and interlink them from their patches,
+// the patch_interp objects and interlink them from their patches,
// and finish linking the interpatch_ghost_zone objects to the
-// patch_frontier objects.
+// patch_interp objects.
//
//*****************************************************************************
@@ -129,7 +129,7 @@ class patch_edge;
class ghost_zone;
class symmetry_ghost_zone;
class interpatch_ghost_zone;
-class patch_frontier;
+class patch_interp;
class patch_system;
//
@@ -351,7 +351,7 @@ private:
void set_ghost_zone(const patch_edge& edge, ghost_zone* gzp);
// this function is used only by
- // interpatch_ghost_zone::setup_other_patch_frontier():
+ // interpatch_ghost_zone::setup_other_patch_interp():
// it assert() that the patch frontier pointer on the specified edge
// is NULL (i.e. that we haven't already setup this patch frontier),
// then assigns a new value to it
@@ -361,17 +361,17 @@ private:
//
// KLUDGE:
// ... this function should really be private, and
- // interpatch_ghost_zone::setup_other_patch_frontier():
+ // interpatch_ghost_zone::setup_other_patch_interp():
// be declared a friend of this class, but .cc files need
// to #include this header file ("patch.hh") before
// "ghost_zone.hh" to get inline functions properly inlined,
// so there's no clean way to make
- // interpatch_ghost_zone::setup_other_patch_frontier():
+ // interpatch_ghost_zone::setup_other_patch_interp():
// a friend here ==> we just make it public for now :( :(
//
public:
- void set_patch_frontier(const patch_edge& edge,
- const patch_frontier* pfp)
+ void set_patch_interp(const patch_edge& edge,
+ const patch_interp* pfp)
const;
@@ -438,15 +438,15 @@ private:
// frontiers (NULL pointers if no frontier for this ghost zone)
// ... pointers are set to NULL by ctor,
// reset for those cases where there *is* a frontier by
- // set_patch_frontier(), which is called by the *other* patch's
- // interpatch_ghost_zone::setup_other_patch_frontier()
+ // set_patch_interp(), which is called by the *other* patch's
+ // interpatch_ghost_zone::setup_other_patch_interp()
// ... contrary to appearance, "mutable" here refers to the pointers,
- // not to the patch_frontier objects to which they point!
+ // not to the patch_interp objects to which they point!
//
- mutable const patch_frontier* min_rho_patch_frontier_;
- mutable const patch_frontier* max_rho_patch_frontier_;
- mutable const patch_frontier* min_sigma_patch_frontier_;
- mutable const patch_frontier* max_sigma_patch_frontier_;
+ mutable const patch_interp* min_rho_patch_interp_;
+ mutable const patch_interp* max_rho_patch_interp_;
+ mutable const patch_interp* min_sigma_patch_interp_;
+ mutable const patch_interp* max_sigma_patch_interp_;
};
//*****************************************************************************
diff --git a/src/patch/patch_system.cc b/src/patch/patch_system.cc
index 52aa7e9..478d510 100644
--- a/src/patch/patch_system.cc
+++ b/src/patch/patch_system.cc
@@ -47,7 +47,7 @@ using jtutil::error_exit;
#include "patch.hh"
#include "patch_edge.hh"
#include "ghost_zone.hh"
-#include "patch_frontier.hh"
+#include "patch_interp.hh"
#include "patch_system.hh"
#include "patch_system_info.hh"
diff --git a/src/patch/patch_system.hh b/src/patch/patch_system.hh
index edd56a9..f89f9e1 100644
--- a/src/patch/patch_system.hh
+++ b/src/patch/patch_system.hh
@@ -18,7 +18,7 @@
// patch.hh
// patch_edge.hh
// ghost_zone.hh
-// patch_frontier.hh
+// patch_interp.hh
//
//******************************************************************************
diff --git a/src/patch/test_patch_system.cc b/src/patch/test_patch_system.cc
index 82df69e..be4720c 100644
--- a/src/patch/test_patch_system.cc
+++ b/src/patch/test_patch_system.cc
@@ -47,7 +47,7 @@ using jtutil::error_exit;
#include "patch.hh"
#include "patch_edge.hh"
#include "ghost_zone.hh"
-#include "patch_frontier.hh"
+#include "patch_interp.hh"
#include "patch_system.hh"
//******************************************************************************