From 58d8c0e9ba4217b011ed5fc572973dca842ee5f2 Mon Sep 17 00:00:00 2001 From: goodale Date: Mon, 17 May 2004 11:51:13 +0000 Subject: Untabified. git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/Extract/trunk@96 5301f0c2-dbc4-4cee-b2f5-8d7afba4d129 --- src/D2_extract.F | 24 ++++++++++++------------ src/Extract.F | 10 +++++----- src/cartesian_to_spherical.F | 10 +++++----- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/D2_extract.F b/src/D2_extract.F index 69f65f1..4a21398 100644 --- a/src/D2_extract.F +++ b/src/D2_extract.F @@ -119,8 +119,8 @@ c ------------------ IF (do_ADMmass(1) == 1) THEN c print*,'1' -c Calculate ADM mass using standard formula - DO j = 2, Np+1 +c Calculate ADM mass using standard formula + DO j = 2, Np+1 DO i = 2, Nt+1 temp(i,j) = ADMmass_int1(i-1,j-1)*SIN(theta(i-1)) ENDDO @@ -132,7 +132,7 @@ c Calculate ADM mass using standard formula c print*,'2' c Calculate ADM mass using conformal formula - DO j = 2, Np+1 + DO j = 2, Np+1 DO i = 2, Nt+1 temp(i,j) = ADMmass_int2(i-1,j-1)*SIN(theta(i-1)) ENDDO @@ -146,7 +146,7 @@ c ------------------ IF (do_momentum == 1) THEN c print*,'3' - DO j = 2, Np+1 + DO j = 2, Np+1 DO i = 2, Nt+1 temp(i,j) = momentum_int1(i-1,j-1)*SIN(theta(i-1)) ENDDO @@ -154,7 +154,7 @@ c print*,'3' momentum(1) = sphere_int(temp,igrid,Nt+1,Np+1,Dt,Dp) c print*,'4' - DO j = 2, Np+1 + DO j = 2, Np+1 DO i = 2, Nt+1 temp(i,j) = momentum_int2(i-1,j-1)*SIN(theta(i-1)) ENDDO @@ -162,7 +162,7 @@ c print*,'4' momentum(2) = sphere_int(temp,igrid,Nt+1,Np+1,Dt,Dp) c print*,'5' - DO j = 2, Np+1 + DO j = 2, Np+1 DO i = 2, Nt+1 temp(i,j) = momentum_int3(i-1,j-1)*SIN(theta(i-1)) ENDDO @@ -176,7 +176,7 @@ c -------------- IF (do_spin == 1) THEN c print*,'6' - DO j = 2, Np+1 + DO j = 2, Np+1 DO i = 2, Nt+1 temp(i,j) = spin_int1(i-1,j-1)*SIN(theta(i-1)) ENDDO @@ -184,7 +184,7 @@ c print*,'6' spin(1) = sphere_int(temp,igrid,Nt+1,Np+1,Dt,Dp) c print*,'7' - DO j = 2, Np+1 + DO j = 2, Np+1 DO i = 2, Nt+1 temp(i,j) = spin_int2(i-1,j-1)*SIN(theta(i-1)) ENDDO @@ -192,7 +192,7 @@ c print*,'7' spin(2) = sphere_int(temp,igrid,Nt+1,Np+1,Dt,Dp) c print*,'8' - DO j = 2, Np+1 + DO j = 2, Np+1 DO i = 2, Nt+1 temp(i,j) = spin_int3(i-1,j-1)*SIN(theta(i-1)) ENDDO @@ -557,13 +557,13 @@ c ------------------------------------------------------------------ WRITE(104,*) eta,K WRITE(105,*) eta,c1 WRITE(106,*) eta,c2 - WRITE(107,*) eta,dG + WRITE(107,*) eta,dG WRITE(108,*) eta,dK WRITE(109,*) eta,dc2 WRITE(201,*) eta,mass - WRITE(202,*) eta,rsch + WRITE(202,*) eta,rsch WRITE(203,*) eta,drschdri - WRITE(301,*) eta,Qeven(:,lmax,mmax) + WRITE(301,*) eta,Qeven(:,lmax,mmax) WRITE(302,*) eta,Qodd(:,lmax,mmax) ENDIF diff --git a/src/Extract.F b/src/Extract.F index e087293..67259fe 100644 --- a/src/Extract.F +++ b/src/Extract.F @@ -168,11 +168,11 @@ c Create 1D coordinate arrays c See if the ADM mass should be calculated and output IF (doADMmass == 1) THEN do_ADMmass(1) = 1 - IF (conformal_state == 1) THEN + IF (conformal_state == 1) THEN do_ADMmass(2) = 1 ELSE do_ADMmass(2) = 0 - ENDIF + ENDIF ELSE do_ADMmass(:) = 0 END IF @@ -214,7 +214,7 @@ c ------------------------------------------------------------------ IF (all_modes == 1) THEN lmin = 2 - lmax = lmode + lmax = lmode c Get m_mode in this case too, or the T3E has a junk value (PW) mmode = 0 ALLOCATE(Qodd(2,2:lmode,0:lmode),Qeven(2,2:lmode,0:lmode)) @@ -547,11 +547,11 @@ c Cannot use the conformal equation for ADM mass now IF (verbose == 1) THEN IF (openfile == 1) THEN - WRITE(*,*) "Extracting at ",ndet," detectors " + WRITE(*,*) "Extracting at ",ndet," detectors " DO idet=1,ndet WRITE(*,*) " r = ",detector(idet) ENDDO - END IF + END IF END IF detector_loop: DO idet = 1,ndet diff --git a/src/cartesian_to_spherical.F b/src/cartesian_to_spherical.F index d55f84f..f75aea4 100644 --- a/src/cartesian_to_spherical.F +++ b/src/cartesian_to_spherical.F @@ -56,7 +56,7 @@ c ------------------------------------------------------------------ DO it = 1, Nt - ct = COS(theta(it)) ; ct2 = ct*ct + ct = COS(theta(it)) ; ct2 = ct*ct st = SIN(theta(it)) ; st2 = st*st DO ip = 1, Np @@ -64,9 +64,9 @@ c ------------------------------------------------------------------ cp = COS(phi(ip)) ; cp2 = cp*cp sp = SIN(phi(ip)) ; sp2 = sp*sp - gxx = gxxs(it,ip) ; dgxx = dgxxs(it,ip) - gxy = gxys(it,ip) ; dgxy = dgxys(it,ip) - gxz = gxzs(it,ip) ; dgxz = dgxzs(it,ip) + gxx = gxxs(it,ip) ; dgxx = dgxxs(it,ip) + gxy = gxys(it,ip) ; dgxy = dgxys(it,ip) + gxz = gxzs(it,ip) ; dgxz = dgxzs(it,ip) gyy = gyys(it,ip) ; dgyy = dgyys(it,ip) gyz = gyzs(it,ip) ; dgyz = dgyzs(it,ip) gzz = gzzs(it,ip) ; dgzz = dgzzs(it,ip) @@ -99,7 +99,7 @@ c ------------------------------------------------------------------ & -two*cp*sp*dgxy+cp2*dgyy) END DO - + END DO -- cgit v1.2.3