diff options
-rw-r--r-- | src/bc_noise.c | 24 | ||||
-rw-r--r-- | src/id_noise.h | 1 | ||||
-rw-r--r-- | src/noise.h | 7 |
3 files changed, 15 insertions, 17 deletions
diff --git a/src/bc_noise.c b/src/bc_noise.c index 0336cd8..0b99428 100644 --- a/src/bc_noise.c +++ b/src/bc_noise.c @@ -188,11 +188,11 @@ static int ApplyBndNoise (const cGH *GH, } #endif /* DEBUG_BOUNDARY */ /* lower x */ - NOISY_BOUNDARY (doBC[0], stencil[0], lssh[1], lssh[2], - i, j, k, rand); + BOUNDARY_NOISE (doBC[0], stencil[0], lssh[1], lssh[2], + i, j, k); /* upper x */ - NOISY_BOUNDARY (doBC[1], stencil[0], lssh[1], lssh[2], - lssh[0]-i-1, j, k, rand); + BOUNDARY_NOISE (doBC[1], stencil[0], lssh[1], lssh[2], + lssh[0]-i-1, j, k); } if (gdim > 1) @@ -209,11 +209,11 @@ static int ApplyBndNoise (const cGH *GH, } #endif /* DEBUG_BOUNDARY */ /* lower y */ - NOISY_BOUNDARY (doBC[2], lssh[0], stencil[1], lssh[2], - i, j, k, rand); + BOUNDARY_NOISE (doBC[2], lssh[0], stencil[1], lssh[2], + i, j, k); /* upper y */ - NOISY_BOUNDARY (doBC[3], lssh[0], stencil[1], lssh[2], - i, lssh[1]-j-1, k, rand); + BOUNDARY_NOISE (doBC[3], lssh[0], stencil[1], lssh[2], + i, lssh[1]-j-1, k); } if (gdim > 2) { @@ -228,11 +228,11 @@ static int ApplyBndNoise (const cGH *GH, } #endif /* DEBUG_BOUNDARY */ /* lower z */ - NOISY_BOUNDARY (doBC[4], lssh[0], lssh[1], stencil[2], - i, j, k, rand); + BOUNDARY_NOISE (doBC[4], lssh[0], lssh[1], stencil[2], + i, j, k); /* upper z */ - NOISY_BOUNDARY (doBC[5], lssh[0], lssh[1], stencil[2], - i, j, lssh[2]-k-1, rand); + BOUNDARY_NOISE (doBC[5], lssh[0], lssh[1], stencil[2], + i, j, lssh[2]-k-1); } } diff --git a/src/id_noise.h b/src/id_noise.h index 6302306..e5f919b 100644 --- a/src/id_noise.h +++ b/src/id_noise.h @@ -29,7 +29,6 @@ { \ if (doBC) \ { \ - srandom(time(0)); \ for (k = 0; k < kend; k++) \ { \ for (j = 0; j < jend; j++) \ diff --git a/src/noise.h b/src/noise.h index 6302306..f510a52 100644 --- a/src/noise.h +++ b/src/noise.h @@ -22,10 +22,9 @@ #define INDEX_3D(lsh, i, j, k) ((i) + (lsh)[0]*((j) + (lsh)[1]*(k))) -#define NOISY_BOUNDARY(doBC, \ - iend, jend, kend, \ - ii, jj, kk, \ - rand) \ +#define BOUNDARY_NOISE(doBC, \ + iend, jend, kend, \ + ii, jj, kk) \ { \ if (doBC) \ { \ |