From f4b4a7dc3cf74209c45660494c196df23042d75f Mon Sep 17 00:00:00 2001 From: Ralf Gerlich Date: Tue, 8 Jan 2008 03:07:31 -0800 Subject: [PATCH] Revert "Do not load shared data of own tile." The original commit did not solve the problem, as also neighbouring tiles were used multiple times due to an inconsistency in the tile grid calculations. --- src/BuildTiles/Match/match.cxx | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/BuildTiles/Match/match.cxx b/src/BuildTiles/Match/match.cxx index 175c308c..e38e4f25 100644 --- a/src/BuildTiles/Match/match.cxx +++ b/src/BuildTiles/Match/match.cxx @@ -153,51 +153,51 @@ void TGMatch::load_shared( const TGConstruct& c, neighbor_type n ) { if ( n == SW_Corner ) { // cout << "searching for SW corner data" << endl; cb = sgBucketOffset(clon, clat, -1, 0); - if ( ! (cb==b) ) scan_share_file( base, cb, SE_Corner, n ); + scan_share_file( base, cb, SE_Corner, n ); cb = sgBucketOffset(clon, clat, -1, -1); - if ( ! (cb==b) ) scan_share_file( base, cb, NE_Corner, n ); + scan_share_file( base, cb, NE_Corner, n ); cb = sgBucketOffset(clon, clat, 0, -1); - if ( ! (cb==b) ) scan_share_file( base, cb, NW_Corner, n ); + scan_share_file( base, cb, NW_Corner, n ); } else if ( n == SE_Corner ) { // cout << "searching for SE corner data" << endl; cb = sgBucketOffset(clon, clat, 0, -1); - if ( ! (cb==b) ) scan_share_file( base, cb, NE_Corner, n ); + scan_share_file( base, cb, NE_Corner, n ); cb = sgBucketOffset(clon, clat, 1, -1); - if ( ! (cb==b) ) scan_share_file( base, cb, NW_Corner, n ); + scan_share_file( base, cb, NW_Corner, n ); cb = sgBucketOffset(clon, clat, 1, 0); - if ( ! (cb==b) ) scan_share_file( base, cb, SW_Corner, n ); + scan_share_file( base, cb, SW_Corner, n ); } else if ( n == NE_Corner ) { // cout << "searching for NE corner data" << endl; cb = sgBucketOffset(clon, clat, 1, 0); - if ( ! (cb==b) ) scan_share_file( base, cb, NW_Corner, n ); + scan_share_file( base, cb, NW_Corner, n ); cb = sgBucketOffset(clon, clat, 1, 1); - if ( ! (cb==b) ) scan_share_file( base, cb, SW_Corner, n ); + scan_share_file( base, cb, SW_Corner, n ); cb = sgBucketOffset(clon, clat, 0, 1); - if ( ! (cb==b) ) scan_share_file( base, cb, SE_Corner, n ); + scan_share_file( base, cb, SE_Corner, n ); } else if ( n == NW_Corner ) { // cout << "searching for NW corner data" << endl; cb = sgBucketOffset(clon, clat, 0, 1); - if ( ! (cb==b) ) scan_share_file( base, cb, SW_Corner, n ); + scan_share_file( base, cb, SW_Corner, n ); cb = sgBucketOffset(clon, clat, -1, 1); - if ( ! (cb==b) ) scan_share_file( base, cb, SE_Corner, n ); + scan_share_file( base, cb, SE_Corner, n ); cb = sgBucketOffset(clon, clat, -1, 0); - if ( ! (cb==b) ) scan_share_file( base, cb, NE_Corner, n ); + scan_share_file( base, cb, NE_Corner, n ); } else if ( n == NORTH ) { // cout << "searching for NORTH edge data" << endl; cb = sgBucketOffset(clon, clat, 0, 1); - if ( ! (cb==b) ) scan_share_file( base, cb, SOUTH, n ); + scan_share_file( base, cb, SOUTH, n ); } else if ( n == SOUTH ) { // cout << "searching for SOUTH edge data" << endl; cb = sgBucketOffset(clon, clat, 0, -1); - if ( ! (cb==b) ) scan_share_file( base, cb, NORTH, n ); + scan_share_file( base, cb, NORTH, n ); } else if ( n == EAST ) { // cout << "searching for EAST edge data" << endl; cb = sgBucketOffset(clon, clat, 1, 0); - if ( ! (cb==b) ) scan_share_file( base, cb, WEST, n ); + scan_share_file( base, cb, WEST, n ); } else if ( n == WEST ) { // cout << "searching for WEST edge data" << endl; cb = sgBucketOffset(clon, clat, -1, 0); - if ( ! (cb==b) ) scan_share_file( base, cb, EAST, n ); + scan_share_file( base, cb, EAST, n ); } }