merge in changes from laptop:

- fix nasty bug in interpatch_ghost_zone::min_ipar()
  and interpatch_ghost_zone::max_ipar()
  where we used the corners when we shouldn't
- fix similar bug in interpatch_ghost_zone::finish_setup()
  where we used *our* adjacent ghost zone types to decide what to tell
  the other patch's patch_interp object about whether or not to use
  its min/max par corners -- this should be the *other* patch's adjacent
  ghost zones
- rename that to min/max par ghost zones
- rename some other functions
- finish implementing patch_system::synchronize_Jacobian()
  to properly take into account the 3-phase algorithm of
  patch_system::synchronize()


git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/AHFinderDirect/trunk@693 f88db872-0e4f-0410-b76b-b9085cfa78c5

1 files changed, 6 insertions, 13 deletions

diff --git a/src/patch/patch.hh b/src/patch/patch.hh
index 3724188..8a90d56 100644
--- a/src/patch/patch.hh
+++ b/src/patch/patch.hh
@@ -163,6 +163,8 @@ public:
 	// n.b. this does *not* compare any of the gridfn data!
 	bool operator==(const patch& other_patch) const
 		{ return patch_number() == other_patch.patch_number(); }
+	bool operator!=(const patch& other_patch) const
+		{ return ! operator==(other_patch); }
 
 	// (rho,sigma,tau) coordinates as singleton coordinate sets
 	local_coords::coords_set coords_set_rho() const
@@ -312,9 +314,6 @@ public:
 		assert(max_sigma_ghost_zone_ != NULL);
 		return *max_sigma_ghost_zone_;
 		}
-
-	// ... these fns are defined explicitly (unlike for grid:: stuff)
-	//     because they're actually used by Jacobian code in ../gr/
 	ghost_zone& minmax_rho_ghost_zone(bool want_min)
 		const
 		{
@@ -337,21 +336,15 @@ public:
 
 	ghost_zone& ghost_zone_on_edge(const patch_edge &e) const;
 
-	// which of the two ghost zones at a specifieid corner,
+	// which of the two ghost zones at a specified corner,
 	// contains a specified point?
 	ghost_zone& corner_ghost_zone_containing_point
 		(bool rho_is_min, bool sigma_is_min,	// specifies corner
 		 int irho, int isigma)			// specifies point
 		const;
 
-	// get ghost zone on specified edge,
-	// assert() that it is indeed of the specified type,
-	// static_cast<> to {symmetry,interpatch}_ghost_zone&
-	symmetry_ghost_zone& symmetry_ghost_zone_on_edge
-		(const patch_edge &e)
-		const;
-	interpatch_ghost_zone& interpatch_ghost_zone_on_edge
-		(const patch_edge &e)
+	// which ghost zone contains a specified point?
+	ghost_zone& ghost_zone_containing_point(int irho, int isigma)
 		const;
 
 
@@ -367,7 +360,7 @@ public:
 	// assert() that this ghost zone hasn't been set up yet,
 	// then set it up as periodic-symmetry
 	void create_periodic_symmetry_ghost_zone
-		(const patch_edge& my_edge, const patch_edge& symmetry_edge,
+		(const patch_edge& my_edge, const patch_edge& other_edge,
 		 bool ipar_map_is_plus);
 
 	// assert() that this ghost zone hasn't been set up yet,