[Commits] [svn:einsteintoolkit] IDBrillData/trunk/src/ (Rev. 129)
schnetter at cct.lsu.edu
schnetter at cct.lsu.edu
Wed Oct 30 10:20:38 CDT 2013
User: eschnett
Date: 2013/10/30 10:20 AM
Modified:
/trunk/src/
finishbrilldata.F, setupbrilldata2D.F, setupbrilldata3D.F
Log:
Make code compile when CCTK_REAL is real*4
File Changes:
Directory: /trunk/src/
======================
File [modified]: finishbrilldata.F
Delta lines: +3 -3
===================================================================
--- trunk/src/finishbrilldata.F 2013-05-27 22:32:47 UTC (rev 128)
+++ trunk/src/finishbrilldata.F 2013-10-30 15:20:38 UTC (rev 129)
@@ -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 @@
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.)
File [modified]: setupbrilldata2D.F
Delta lines: +2 -3
===================================================================
--- trunk/src/setupbrilldata2D.F 2013-05-27 22:32:47 UTC (rev 128)
+++ trunk/src/setupbrilldata2D.F 2013-10-30 15:20:38 UTC (rev 129)
@@ -33,7 +33,6 @@
DECLARE_CCTK_PARAMETERS
integer i,j,k
- integer ierr
CCTK_REAL x1,y1,z1,rho1
CCTK_REAL brillq,eps
@@ -87,12 +86,12 @@
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
File [modified]: setupbrilldata3D.F
Delta lines: +5 -5
===================================================================
--- trunk/src/setupbrilldata3D.F 2013-05-27 22:32:47 UTC (rev 128)
+++ trunk/src/setupbrilldata3D.F 2013-10-30 15:20:38 UTC (rev 129)
@@ -100,16 +100,16 @@
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 @@
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)
More information about the Commits
mailing list