diff options
| author | goodale <goodale@7ec00dc9-1e7a-42ad-bf73-a299ee168e72> | 2004-09-10 04:28:52 +0000 |
|---|---|---|
| committer | goodale <goodale@7ec00dc9-1e7a-42ad-bf73-a299ee168e72> | 2004-09-10 04:28:52 +0000 |
| commit | 0a19058dab7da77d21fc6faf981e809f6da39d81 (patch) | |
| tree | bed971f4e1f843a846c8d49489354502bd099fb8 | |
| parent | 6ec61508d71b142e716227081e8424a2565f6818 (diff) | |
Renaming sqr to square as sqr seemes to have been defined in a system
header on the NEC SX-5.
git-svn-id: http://svn.cactuscode.org/arrangements/CactusWave/IDScalarWaveCXX/trunk@41 7ec00dc9-1e7a-42ad-bf73-a299ee168e72
| -rw-r--r-- | src/InitialData.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/InitialData.cc b/src/InitialData.cc index 57c4aab..2ffa8b8 100644 --- a/src/InitialData.cc +++ b/src/InitialData.cc @@ -19,7 +19,7 @@ static char *rcsid = "$Header$"; CCTK_FILEVERSION(CactusWave_IDScalarWaveCXX_InitialData_cc) -inline CCTK_REAL sqr(CCTK_REAL val) +inline CCTK_REAL square(CCTK_REAL val) { return val*val; } @@ -50,7 +50,7 @@ extern "C" void IDScalarWaveCXX_InitialData(CCTK_ARGUMENTS) if(CCTK_Equals(initial_data, "plane")) { - CCTK_REAL omega = sqrt(sqr(kx)+sqr(ky)+sqr(kz)); + CCTK_REAL omega = sqrt(square(kx)+square(ky)+square(kz)); for(int k=0; k<cctk_lsh[2]; k++) { @@ -79,7 +79,7 @@ extern "C" void IDScalarWaveCXX_InitialData(CCTK_ARGUMENTS) CCTK_REAL X = x[vindex], Y = y[vindex], Z = z[vindex]; CCTK_REAL R = sqrt(X*X + Y*Y + Z*Z); - phi[vindex] = amplitude*exp( - sqr( (R - radius) / sigma ) ); + phi[vindex] = amplitude*exp( - square( (R - radius) / sigma ) ); if (R == 0.0) { phi_p[vindex] = amplitude*(1.0 - 2.0*dt*dt/sigma)*exp(-dt*dt/sigma); @@ -87,9 +87,9 @@ extern "C" void IDScalarWaveCXX_InitialData(CCTK_ARGUMENTS) else { phi_p[vindex] = amplitude/2.0*(R-dt)/R* - exp( - sqr( (R - radius - dt)/ sigma ) ) + exp( - square( (R - radius - dt)/ sigma ) ) + amplitude/2.0*(R+dt)/R* - exp( - sqr( (R - radius + dt)/ sigma ) ); + exp( - square( (R - radius + dt)/ sigma ) ); } } } @@ -98,7 +98,7 @@ extern "C" void IDScalarWaveCXX_InitialData(CCTK_ARGUMENTS) else if(CCTK_Equals(initial_data, "box")) { CCTK_REAL pi = 4.0*atan(1.0); - CCTK_REAL omega = sqrt(sqr(kx)+sqr(ky)+sqr(kz)); + CCTK_REAL omega = sqrt(square(kx)+square(ky)+square(kz)); for(int k=0; k<cctk_lsh[2]; k++) { |