diff options
| author | allen <allen@6a38eb6e-646e-4a02-a296-d141613ad6c4> | 2004-03-22 01:19:46 +0000 |
|---|---|---|
| committer | allen <allen@6a38eb6e-646e-4a02-a296-d141613ad6c4> | 2004-03-22 01:19:46 +0000 |
| commit | 296c51d02112757dee75f2953122b0745dc818b3 (patch) | |
| tree | 2b87e41dc1a7344a1a8afc0a1ca9da6e6ba40032 | |
| parent | 07892b5916aebdb8edf06a5a3bd2c950488bb278 (diff) | |
Put macros on one line so that Cactus cpp can deal with them.
git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/Boundary/trunk@268 6a38eb6e-646e-4a02-a296-d141613ad6c4
| -rw-r--r-- | src/FlatBoundary.c | 19 | ||||
| -rw-r--r-- | src/StaticBoundary.c | 9 |
2 files changed, 9 insertions, 19 deletions
diff --git a/src/FlatBoundary.c b/src/FlatBoundary.c index fcf3621..948add7 100644 --- a/src/FlatBoundary.c +++ b/src/FlatBoundary.c @@ -1034,12 +1034,9 @@ static int ApplyBndFlat (const cGH *GH, } #endif /* DEBUG_BOUNDARY */ /* lower x */ - FLAT_BOUNDARY (doBC[0], widths[0], lssh[1], lssh[2], - i, j, k, widths[0], j, k); + FLAT_BOUNDARY (doBC[0], widths[0], lssh[1], lssh[2], i, j, k, widths[0], j, k); /* upper x */ - FLAT_BOUNDARY (doBC[1], widths[1], lssh[1], lssh[2], - lssh[0]-i-1, j, k, lssh[0]-widths[1]-1, j, k); - + FLAT_BOUNDARY (doBC[1], widths[1], lssh[1], lssh[2], lssh[0]-i-1, j, k, lssh[0]-widths[1]-1, j, k); } if (gdim > 1) { @@ -1054,11 +1051,9 @@ static int ApplyBndFlat (const cGH *GH, } #endif /* DEBUG_BOUNDARY */ /* lower y */ - FLAT_BOUNDARY (doBC[2], lssh[0], widths[2], lssh[2], - i, j, k, i, widths[2], k); + FLAT_BOUNDARY (doBC[2], lssh[0], widths[2], lssh[2], i, j, k, i, widths[2], k); /* upper y */ - FLAT_BOUNDARY (doBC[3], lssh[0], widths[3], lssh[2], - i, lssh[1]-j-1, k, i, lssh[1]-widths[3]-1, k); + FLAT_BOUNDARY (doBC[3], lssh[0], widths[3], lssh[2], i, lssh[1]-j-1, k, i, lssh[1]-widths[3]-1, k); } if (gdim > 2) { @@ -1073,11 +1068,9 @@ static int ApplyBndFlat (const cGH *GH, } #endif /* DEBUG_BOUNDARY */ /* lower z */ - FLAT_BOUNDARY (doBC[4], lssh[0], lssh[1], widths[4], - i, j, k, i, j, widths[4]); + FLAT_BOUNDARY (doBC[4], lssh[0], lssh[1], widths[4], i, j, k, i, j, widths[4]); /* upper z */ - FLAT_BOUNDARY (doBC[5], lssh[0], lssh[1], widths[5], - i, j, lssh[2]-k-1, i, j, lssh[2]-widths[5]-1); + FLAT_BOUNDARY (doBC[5], lssh[0], lssh[1], widths[5], i, j, lssh[2]-k-1, i, j, lssh[2]-widths[5]-1); } } diff --git a/src/StaticBoundary.c b/src/StaticBoundary.c index f5d7b65..442cff9 100644 --- a/src/StaticBoundary.c +++ b/src/StaticBoundary.c @@ -1045,24 +1045,21 @@ static int ApplyBndStatic (const cGH *GH, /* lower x */ STATIC_BOUNDARY (doBC[0], widths[0], lssh[1], lssh[2], i, j, k); /* upper x */ - STATIC_BOUNDARY (doBC[1], widths[1], lssh[1], lssh[2], lssh[0]-i-1, j, - k); + STATIC_BOUNDARY (doBC[1], widths[1], lssh[1], lssh[2], lssh[0]-i-1, j, k); } if (gdim > 1) { /* lower y */ STATIC_BOUNDARY (doBC[2], lssh[0], widths[2], lssh[2], i, j, k); /* upper y */ - STATIC_BOUNDARY (doBC[3], lssh[0], widths[3], lssh[2], i, lssh[1]-j-1, - k); + STATIC_BOUNDARY (doBC[3], lssh[0], widths[3], lssh[2], i, lssh[1]-j-1,k); } if (gdim > 2) { /* lower z */ STATIC_BOUNDARY (doBC[4], lssh[0], lssh[1], widths[4], i, j, k); /* upper z */ - STATIC_BOUNDARY (doBC[5], lssh[0], lssh[1], widths[5], i, j, - lssh[2]-k-1); + STATIC_BOUNDARY (doBC[5], lssh[0], lssh[1], widths[5], i, j,lssh[2]-k-1); } } |