diff options
| author | eschnett <eschnett@a678b1cf-93e1-4b43-a69d-d43939e66649> | 2013-10-30 15:20:38 +0000 |
|---|---|---|
| committer | eschnett <eschnett@a678b1cf-93e1-4b43-a69d-d43939e66649> | 2013-10-30 15:20:38 +0000 |
| commit | 445e2850879ea9da712bda3cd5aee7a9de4b294a (patch) | |
| tree | 75a8a0e7e0e21e32e77479a87074f989f0813f83 | |
| parent | 21f2f0f02ce20a45b0033aa6c3ec424dc74b9217 (diff) | |
Make code compile when CCTK_REAL is real*4svn
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/IDBrillData/trunk@129 a678b1cf-93e1-4b43-a69d-d43939e66649
| -rw-r--r-- | src/finishbrilldata.F | 6 | ||||
| -rw-r--r-- | src/setupbrilldata2D.F | 5 | ||||
| -rw-r--r-- | src/setupbrilldata3D.F | 10 |
3 files changed, 10 insertions, 11 deletions
diff --git a/src/finishbrilldata.F b/src/finishbrilldata.F index 5efb886..17c66b1 100644 --- a/src/finishbrilldata.F +++ b/src/finishbrilldata.F @@ -31,8 +31,8 @@ c Numbers. - zero = 0.0D0 - one = 1.0D0 + zero = 0.0 + one = 1.0 c Replace flat metric left over from elliptic solve by c Brill metric calculated from q and Psi. @@ -50,7 +50,7 @@ c Brill metric calculated from q and Psi. phi = phif(x1,y1) - e2q = exp(2.d0*brillq(rho1,z1,phi)) + e2q = exp(2.0*brillq(rho1,z1,phi)) c Fudge division by rho^2 on axis. (Physically, y^/rho^2, c x^2/rho^2 and xy/rho^2 are of course regular.) diff --git a/src/setupbrilldata2D.F b/src/setupbrilldata2D.F index cdc722c..01bf379 100644 --- a/src/setupbrilldata2D.F +++ b/src/setupbrilldata2D.F @@ -33,7 +33,6 @@ c f DECLARE_CCTK_PARAMETERS integer i,j,k - integer ierr CCTK_REAL x1,y1,z1,rho1 CCTK_REAL brillq,eps @@ -87,12 +86,12 @@ c will not be regular on the axis. rhop = rho1 + eps rhom = rho1 - eps - brillMlinear(i,j,k) = 0.25D0 + brillMlinear(i,j,k) = 0.25 . *(brillq(rho1,zp,zero) . + brillq(rho1,zm,zero) . + brillq(rhop,z1,zero) . + brillq(rhom,z1,zero) - . - 4.0D0*brillq(rho1,z1,zero))/eps**2 + . - 4.0*brillq(rho1,z1,zero))/eps**2 brillNsource(i,j,k) = zero diff --git a/src/setupbrilldata3D.F b/src/setupbrilldata3D.F index b37c28c..8101cce 100644 --- a/src/setupbrilldata3D.F +++ b/src/setupbrilldata3D.F @@ -100,16 +100,16 @@ c is not regular on the axis. gzz(i,j,k) = e2q gxy(i,j,k) = - (one - e2q)*x1*y1/rho2 - brillMlinear(i,j,k) = 0.25D0/e2q + brillMlinear(i,j,k) = 0.25/e2q . *(brillq(rho1,z1+eps,phi) . + brillq(rho1,z1-eps,phi) . + brillq(rho1+eps,z1,phi) . + brillq(rho1-eps,z1,phi) - . - 4.0D0*brillq(rho1,z1,phi)) + . - 4.0*brillq(rho1,z1,phi)) . / eps**2 - brillMlinear(i,j,k) = brillMlinear(i,j,k) + 0.25D0/rho2 - . *(three*0.25D0*(brillq(rho1,z1,phi+eps) + brillMlinear(i,j,k) = brillMlinear(i,j,k) + 0.25/rho2 + . *(three*0.25*(brillq(rho1,z1,phi+eps) . - brillq(rho1,z1,phi-eps))**2 . + two*(brillq(rho1,z1,phi+eps) . - two*brillq(rho1,z1,phi) @@ -122,7 +122,7 @@ c is not regular on the axis. gzz(i,j,k) = one gxy(i,j,k) = zero - brillMlinear(i,j,k) = 0.25D0/e2q + brillMlinear(i,j,k) = 0.25/e2q . *(brillq(rho1,z1+eps,phi) . + brillq(rho1,z1-eps,phi) . + two*brillq(eps,z1,phi) |