User: eschnett Date: 2013/10/30 10:19 AM
Modified: /trunk/src/ IDAxiOddBrillBH.F, ckerr.x, gij.x, kerr.x, ksq_bs.x, qfunc_even.x
Log: Change real*8 to CCTK_REAL
File Changes:
Directory: /trunk/src/ ======================
File [modified]: IDAxiOddBrillBH.F Delta lines: +11 -11 =================================================================== --- trunk/src/IDAxiOddBrillBH.F 2013-05-27 22:32:45 UTC (rev 69) +++ trunk/src/IDAxiOddBrillBH.F 2013-10-30 15:19:25 UTC (rev 70) @@ -34,26 +34,26 @@ DECLARE_CCTK_PARAMETERS DECLARE_CCTK_FUNCTIONS
- real*8 deta,dq - real*8, allocatable :: ac(:,:),ae(:,:),aw(:,:),an(:,:),as(:,:), + CCTK_REAL deta,dq + CCTK_REAL, allocatable :: ac(:,:),ae(:,:),aw(:,:),an(:,:),as(:,:), $ rhs(:,:),qfetaeta(:,:),qfqq(:,:),ksq(:,:), $ psi2dv(:,:),dpsi2dv(:,:),ddpsi2dv(:,:), $ detapsisph(:,:),dqpsisph(:,:),detaetapsisph(:,:), $ detaqpsisph(:,:),dqqpsisph(:,:), $ etagrd(:),qgrd(:) - real*8 o1,o2,o3,o4,o5,o6,o7,o8,o9,o10, + CCTK_REAL o1,o2,o3,o4,o5,o6,o7,o8,o9,o10, $ o11,o12,o13,o14,o15,o16,o17,o18,o19, $ o20,o21,o22,o23,o24,o25,o26,o27,o28,o29, $ o30,o31,o32,o33,o34,o35,o36,o37,o38,o39, $ o40,o41,o42,o43,o44,o45,o46,o47,o48,o49, $ o50,o51 - real*8 t1,t2,t3,t4 - real*8 gtil,dngtil,dnngtil,dnnngtil,dnnnngtil,dnnnnngtil, + CCTK_REAL t1,t2,t3,t4 + CCTK_REAL gtil,dngtil,dnngtil,dnnngtil,dnnnngtil,dnnnnngtil, $ dnnnnnngtil,dnnnnnnngtil - real*8 rhsmax,rmax,odd_get2d,adm,Jmom,mass,a,r_iso,rBL,rbh_eps - real*8,parameter :: rbh_tol = 1.0d-7 + CCTK_REAL rhsmax,rmax,odd_get2d,adm,Jmom,mass,a,r_iso,rBL,rbh_eps + CCTK_REAL,parameter :: rbh_tol = 1.0d-7 integer,parameter :: itmax = 100 - real*8 pi,zero,one,two + CCTK_REAL pi,zero,one,two CCTK_REAL :: xmin,xmax,ymin,ymax,zmin,zmax integer :: ne, nq integer :: nx,ny,nz @@ -419,10 +419,10 @@ c c Compute eta,q,phi at the each points of cartesian grid
- eta = 0.5d0 * dlog(x**2 + y**2 + z**2) + eta = 0.5 * log(x**2 + y**2 + z**2) abseta = abs (eta) - q = datan2 (sqrt (x**2 + y**2),z) - phi = datan2 (y, x) + q = atan2 (sqrt (x**2 + y**2),z) + phi = atan2 (y, x)
do k = 1,nz do j = 1,ny
File [modified]: ckerr.x Delta lines: +3 -3 =================================================================== --- trunk/src/ckerr.x 2013-05-27 22:32:45 UTC (rev 69) +++ trunk/src/ckerr.x 2013-10-30 15:19:25 UTC (rev 70) @@ -1,7 +1,7 @@ - mass = sqrt(2.00000000000000d0 + sqrt(4.0000000000000d0 + byJ**2 + mass = sqrt(2.0 + sqrt(4.0 + byJ**2 & )) a = byJ/mass - rBL = 5.0000000000000d-1*exp(eta(i,j,k))*(1.00000000000000d0 + (1.d0*(a + rBL = 5.0e-1*exp(eta(i,j,k))*(1.0 + (1.0*(a & + mass)*exp(-eta(i,j,k)))/sqrt(-a**2 + mass**2))*sqrt(-a**2 + mass**2) - & *(1.00000000000000d0 + (1.d0*(a + mass)*exp(-eta(i,j,k)))/sqrt(a**2 + m + & *(1.0 + (1.*(a + mass)*exp(-eta(i,j,k)))/sqrt(a**2 + m & ass**2))
File [modified]: gij.x Delta lines: +6 -6 =================================================================== --- trunk/src/gij.x 2013-05-27 22:32:45 UTC (rev 69) +++ trunk/src/gij.x 2013-10-30 15:19:25 UTC (rev 70) @@ -1,9 +1,9 @@ - o1 = 2.d0*phi(i,j,k) + o1 = 2.0*phi(i,j,k) o2 = cos(o1) o3 = -xi o4 = cos(q(i,j,k)) o5 = o4*xi - o6 = 1.d0 + o3 + o5 + o6 = 1.0 + o3 + o5 o7 = -eta0_me o8 = eta(i,j,k) + o7 o9 = o8**2 @@ -18,12 +18,12 @@ o18 = o13 + o17 o19 = sin(q(i,j,k)) o20 = o19**n_me - o21 = 2.d0*amp_me*o18*o20*o6 + o21 = 2.0*amp_me*o18*o20*o6 o22 = exp(o21) - o23 = -1.d0 + o22 - gxx(i,j,k) = 5.d-1*(1.d0 + o22 + o2*o23) + o23 = -1.0 + o22 + gxx(i,j,k) = 5.d-1*(1.0 + o22 + o2*o23) gxy(i,j,k) = o23*cos(phi(i,j,k))*sin(phi(i,j,k)) gxz(i,j,k) = 0 - gyy(i,j,k) = 5.d-1*(1.d0 + o22 - o2*o23) + gyy(i,j,k) = 5.d-1*(1.0 + o22 - o2*o23) gyz(i,j,k) = 0 gzz(i,j,k) = o22
File [modified]: kerr.x Delta lines: +3 -3 =================================================================== --- trunk/src/kerr.x 2013-05-27 22:32:45 UTC (rev 69) +++ trunk/src/kerr.x 2013-10-30 15:19:25 UTC (rev 70) @@ -1,7 +1,7 @@ - mass = sqrt(2.00000000000000d0 + sqrt(4.0000000000000d0 + byJ**2 + mass = sqrt(2.0 + sqrt(4.0 + byJ**2 & )) a = byJ/mass - rBL = 5.0000000000000d-1*exp(etagrd(i))*(1.00000000000000d0 + (1.d0*(a + rBL = 5.0e-1*exp(etagrd(i))*(1.0 + (1.0*(a & + mass)*exp(-etagrd(i)))/sqrt(-a**2 + mass**2))*sqrt(-a**2 + mass**2) - & *(1.00000000000000d0 + (1.d0*(a + mass)*exp(-etagrd(i)))/sqrt(a**2 + m + & *(1.0 + (1.0*(a + mass)*exp(-etagrd(i)))/sqrt(a**2 + m & ass**2))
File [modified]: ksq_bs.x Delta lines: +5 -5 =================================================================== --- trunk/src/ksq_bs.x 2013-05-27 22:32:45 UTC (rev 69) +++ trunk/src/ksq_bs.x 2013-10-30 15:19:25 UTC (rev 70) @@ -1,12 +1,12 @@ o1 = cos(qgrd(j)) - o2 = 1.0d0 + o2 = 1.0 o3 = o2**2 o4 = 1/o3 o5 = sin(qgrd(j)) - o6 = 2.0d0 + n + o6 = 2.0 + n o7 = o5**2 o8 = -(o6*o7) - o9 = 1.0d0 + n + o8 + o9 = 1.0 + n + o8 o10 = o3**2 o11 = o10**2 o12 = dngtil**2 @@ -15,9 +15,9 @@ o15 = o9**2 c exc33(i,j) = 0 c exc32(i,j) = -(dngtil*o1*o4*o5**n) -c exc31(i,j) = gtil*o4*o5**(-1.00000000000000d0 + n)*o9 +c exc31(i,j) = gtil*o4*o5**(-1.0 + n)*o9 c exc22(i,j) = 0 c exc21(i,j) = 0 c exc11(i,j) = 0 - ksq(i,j) = (2.0d0*o5**(2*( + ksq(i,j) = (2.0*o5**(2*( $ -2 + n))*(o14*o15 + o12*o13*o7))/(o10*o11)
File [modified]: qfunc_even.x Delta lines: +5 -5 =================================================================== --- trunk/src/qfunc_even.x 2013-05-27 22:32:45 UTC (rev 69) +++ trunk/src/qfunc_even.x 2013-10-30 15:19:25 UTC (rev 70) @@ -1,7 +1,7 @@ o1 = -xi o2 = cos(qgrd(j)) o3 = xi*o2 - o4 = 1.d0 + o1 + o3 + o4 = 1.0 + o1 + o3 o5 = -eta0_me o6 = etagrd(i) + o5 o7 = o6**2 @@ -19,8 +19,8 @@ o19 = o18**n_me o20 = o2**2 o21 = o13 + o17 - qfetaeta(i,j) = amp_me*o19*o4*(-2.d0*o11*o13 - 2.d0*o11*o17 + 4.d0*o10*o15*o - & 17 + 4.d0*o10*o13*o7) - qfqq(i,j) = -(amp_me*xi*n_me*o19*o2*o21) - amp_me*xi*(1.d0 + n_me)*o19*o2*o21 - - & amp_me*n_me*o19*o21*o4 + amp_me*(-1.d0 + n_me)*n_me*o18**(-2 + n)*o20*o21*o + qfetaeta(i,j) = amp_me*o19*o4*(-2.0*o11*o13 - 2.0*o11*o17 + 4.0*o10*o15*o + & 17 + 4.0*o10*o13*o7) + qfqq(i,j) = -(amp_me*xi*n_me*o19*o2*o21) - amp_me*xi*(1.0 + n_me)*o19*o2*o21 - + & amp_me*n_me*o19*o21*o4 + amp_me*(-1.0 + n_me)*n_me*o18**(-2 + n)*o20*o21*o & 4