[Commits] [svn:einsteintoolkit] Exact/trunk/src/metrics/ (Rev. 280)

User: eschnett Date: 2012/10/12 09:53 PM

Modified: /trunk/src/metrics/ Alvi.F77, Bianchi_I.F77, Goedel.F77, Kasner_generalized.F77, Kasner_like.F77, Kerr_BoyerLindquist.F77, Lemaitre.F77, Schwarzschild_Lemaitre.F77, Schwarzschild_Novikov.F77, Schwarzschild_PG.F77, anti_de_Sitter_Lambda.F77, boost_rotation_symmetric.F77, constant_density_star.F77, de_Sitter.F77, de_Sitter_Lambda.F77

Log: Remove save attributes from several metric routines

File Changes:

Directory: /trunk/src/metrics/ ==============================

File [modified]: Alvi.F77 Delta lines: +4 -14 =================================================================== --- trunk/src/metrics/Alvi.F77 2012-10-13 02:29:46 UTC (rev 279) +++ trunk/src/metrics/Alvi.F77 2012-10-13 02:53:45 UTC (rev 280) @@ -29,28 +29,18 @@ CCTK_REAL psi LOGICAL Tmunu_flag

-c static locals - logical firstcall - CCTK_REAL m1,m2,b - data firstcall /.true./ - save firstcall, m1,m2,b -c$omp threadprivate (firstcall, m1,m2,b) - c locals + CCTK_REAL m1,m2,b CCTK_REAL rin1,rin2,rout,x1,x2, r1, r2, r3, results(10)

C this is a vacuum solution with no cosmological constant C ==> it does not set the stress-energy tensor Tmunu_flag = .false.

- if (firstcall) then - m1 = Alvi__mass1 - m2 = Alvi__mass2 - b = Alvi__separation + m1 = Alvi__mass1 + m2 = Alvi__mass2 + b = Alvi__separation

- firstcall = .false. - end if - rin1 = dsqrt(m1*b) rin2 = dsqrt(m2*b) rout = b*dsqrt(b)/(2.0d0*dsqrt(m1+m2))

File [modified]: Bianchi_I.F77 Delta lines: +2 -11 =================================================================== --- trunk/src/metrics/Bianchi_I.F77 2012-10-13 02:29:46 UTC (rev 279) +++ trunk/src/metrics/Bianchi_I.F77 2012-10-13 02:53:45 UTC (rev 280) @@ -33,23 +33,14 @@ CCTK_REAL psi LOGICAL Tmunu_flag

-c local static variables - logical firstcall - CCTK_REAL arad - data firstcall /.true./ - save firstcall, arad -c$omp threadprivate (firstcall, arad) - c local variables + CCTK_REAL arad CCTK_REAL bx, by

C This is a vacuum spacetime with no cosmological constant Tmunu_flag = .false.

- if (firstcall) then - arad = Bianchi_I__scale - firstcall = .false. - end if + arad = Bianchi_I__scale

bx = arad*sin(x+t) by = arad*cos(x+t)

File [modified]: Goedel.F77 Delta lines: +2 -11 =================================================================== --- trunk/src/metrics/Goedel.F77 2012-10-13 02:29:46 UTC (rev 279) +++ trunk/src/metrics/Goedel.F77 2012-10-13 02:53:45 UTC (rev 280) @@ -33,22 +33,13 @@ CCTK_REAL psi LOGICAL Tmunu_flag

-c local static variables - logical firstcall +c local variables CCTK_REAL arad - data firstcall /.true./ - save firstcall, arad -c$omp threadprivate (firstcall, arad) -

C This is a vacuum spacetime with no cosmological constant Tmunu_flag = .false.

- if (firstcall) then - arad = Goedel__scale - firstcall = .false. - end if - + arad = Goedel__scale

gdtt = -arad*arad gdtx = 0.d0

File [modified]: Kasner_generalized.F77 Delta lines: +2 -10 =================================================================== --- trunk/src/metrics/Kasner_generalized.F77 2012-10-13 02:29:46 UTC (rev 279) +++ trunk/src/metrics/Kasner_generalized.F77 2012-10-13 02:53:45 UTC (rev 280) @@ -31,22 +31,14 @@ CCTK_REAL psi LOGICAL Tmunu_flag

-c local static variables - logical firstcall - data firstcall /.true./ - save firstcall, pp1, pp2 - c local variables CCTK_REAL pp1,pp2,a1,a2,a3

C This is a vacuum spacetime with no cosmological constant Tmunu_flag = .true.

- if (firstcall) then - pp1= Kasner_generalized__p1 - pp2= Kasner_generalized__p2 - firstcall = .false. - end if + pp1= Kasner_generalized__p1 + pp2= Kasner_generalized__p2

a1= t**(2.d0*pp1) a2= t**(2.d0*pp2)

File [modified]: Kasner_like.F77 Delta lines: +1 -9 =================================================================== --- trunk/src/metrics/Kasner_like.F77 2012-10-13 02:29:46 UTC (rev 279) +++ trunk/src/metrics/Kasner_like.F77 2012-10-13 02:53:45 UTC (rev 280) @@ -35,21 +35,13 @@ CCTK_REAL psi LOGICAL Tmunu_flag

-c local static variables - logical firstcall - data firstcall /.true./ - save firstcall, qq - c local variables CCTK_REAL qq,a1,a3

c this model sets the stress-energy tensor in the "CalcTmunu" code Tmunu_flag = .true.

- if (firstcall) then - qq = Kasner_like__q - firstcall = .false. - end if + qq = Kasner_like__q

a1= t**(2.d0*qq) a3= t**(2.d0-4.d0*qq)

File [modified]: Kerr_BoyerLindquist.F77 Delta lines: +2 -11 =================================================================== --- trunk/src/metrics/Kerr_BoyerLindquist.F77 2012-10-13 02:29:46 UTC (rev 279) +++ trunk/src/metrics/Kerr_BoyerLindquist.F77 2012-10-13 02:53:45 UTC (rev 280) @@ -31,23 +31,14 @@ $ guxx, guyy, guzz, guxy, guyz, guzx CCTK_REAL psi LOGICAL Tmunu_flag - -c local static variables - logical firstcall - data firstcall /.true./ - save firstcall, arad, marad

CCTK_REAL arad, marad

C This is a vacuum spacetime with no cosmological constant Tmunu_flag = .false.

- if (firstcall) then - arad = Kerr_BoyerLindquist__spin - marad = Kerr_BoyerLindquist__mass - firstcall = .false. - end if - + arad = Kerr_BoyerLindquist__spin + marad = Kerr_BoyerLindquist__mass

gdtt = -(y**2*arad**2+x**2-2*marad*x)/(x**2+y**2*arad**2) gdtx = 2*(arad*marad*x*(y**2-1))/(x**2+y**2*arad**2)

File [modified]: Lemaitre.F77 Delta lines: +5 -14 =================================================================== --- trunk/src/metrics/Lemaitre.F77 2012-10-13 02:29:46 UTC (rev 279) +++ trunk/src/metrics/Lemaitre.F77 2012-10-13 02:53:45 UTC (rev 280) @@ -36,26 +36,17 @@ CCTK_REAL psi LOGICAL Tmunu_flag

- -c local static variables - logical firstcall - CCTK_REAL ka, la, e0, r0 - data firstcall /.true./ - save firstcall, ka, la, e0, r0 - c local variables + CCTK_REAL ka, la, e0, r0 CCTK_REAL unu, ra, ra2, Pii

c this model sets the stress-energy tensor in the "CalcTmunu" code Tmunu_flag = .true.

- if (firstcall) then - ka = Lemaitre__kappa - e0 = Lemaitre__epsilon0 - la = Lemaitre__Lambda - r0 = Lemaitre__R0 - firstcall = .false. - end if + ka = Lemaitre__kappa + e0 = Lemaitre__epsilon0 + la = Lemaitre__Lambda + r0 = Lemaitre__R0

Pii = acos(-1.0D0)

File [modified]: Schwarzschild_Lemaitre.F77 Delta lines: +3 -12 =================================================================== --- trunk/src/metrics/Schwarzschild_Lemaitre.F77 2012-10-13 02:29:46 UTC (rev 279) +++ trunk/src/metrics/Schwarzschild_Lemaitre.F77 2012-10-13 02:53:45 UTC (rev 280) @@ -33,24 +33,15 @@ CCTK_REAL psi LOGICAL Tmunu_flag

-c local static variables - logical firstcall - CCTK_REAL lam, mas - data firstcall /.true./ - save firstcall, lam, mas - c local variables + CCTK_REAL lam, mas CCTK_REAL r2, ppp, unu, doi

C This model has a cosmological constant Tmunu_flag = .true.

- - if (firstcall) then - lam = Schwarzschild_Lemaitre__Lambda - mas = Schwarzschild_Lemaitre__mass - firstcall = .false. - end if + lam = Schwarzschild_Lemaitre__Lambda + mas = Schwarzschild_Lemaitre__mass

r2 =x*x+y*y+z*z

File [modified]: Schwarzschild_Novikov.F77 Delta lines: +3 -14 =================================================================== --- trunk/src/metrics/Schwarzschild_Novikov.F77 2012-10-13 02:29:46 UTC (rev 279) +++ trunk/src/metrics/Schwarzschild_Novikov.F77 2012-10-13 02:53:45 UTC (rev 280) @@ -36,13 +36,8 @@ CCTK_REAL psi LOGICAL Tmunu_flag

-c local static variables - logical firstcall - CCTK_REAL eps, mass - data firstcall /.true./ - save firstcall, eps, mass - c local variables + CCTK_REAL eps, mass CCTK_REAL r,c,psi4

CCTK_REAL nov_dr_drmax, nov_rmax, nov_r @@ -59,15 +54,9 @@

C Get parameters of the exact solution.

- if (firstcall) then + eps = Schwarzschild_Novikov__epsilon + mass= Schwarzschild_Novikov__mass

- eps = Schwarzschild_Novikov__epsilon - mass= Schwarzschild_Novikov__mass - - firstcall = .false. - - end if - r = max(sqrt(x**2 + y**2 + z**2), eps)

c Find r.

File [modified]: Schwarzschild_PG.F77 Delta lines: +3 -11 =================================================================== --- trunk/src/metrics/Schwarzschild_PG.F77 2012-10-13 02:29:46 UTC (rev 279) +++ trunk/src/metrics/Schwarzschild_PG.F77 2012-10-13 02:53:45 UTC (rev 280) @@ -33,13 +33,8 @@ CCTK_REAL psi LOGICAL Tmunu_flag

-c local static variables - logical firstcall - CCTK_REAL eps, m - data firstcall /.true./ - save firstcall, eps, m - c local variables + CCTK_REAL eps, m CCTK_REAL r, bx, by, bz, b2

C This is a vacuum spacetime with no cosmological constant @@ -47,11 +42,8 @@

C Get parameters of the exact solution.

- if (firstcall) then - eps = Schwarzschild_PG__epsilon - m = Schwarzschild_PG__mass - firstcall = .false. - end if + eps = Schwarzschild_PG__epsilon + m = Schwarzschild_PG__mass

r = max(sqrt(x**2 + y**2 + z**2), eps) bx = sqrt(2.d0 * m / r) * x / r

File [modified]: anti_de_Sitter_Lambda.F77 Delta lines: +2 -10 =================================================================== --- trunk/src/metrics/anti_de_Sitter_Lambda.F77 2012-10-13 02:29:46 UTC (rev 279) +++ trunk/src/metrics/anti_de_Sitter_Lambda.F77 2012-10-13 02:53:45 UTC (rev 280) @@ -31,22 +31,14 @@ CCTK_REAL psi LOGICAL Tmunu_flag

-c local static variables - logical firstcall - CCTK_REAL arad - data firstcall /.true./ - save firstcall, arad - c local variables + CCTK_REAL arad CCTK_REAL am

C This model has a cosmological constant Tmunu_flag = .true.

- if (firstcall) then - arad = anti_de_Sitter_Lambda__scale - firstcall = .false. - end if + arad = anti_de_Sitter_Lambda__scale

am=exp(2.0D0*sqrt(-arad/3.0D0)*x)

File [modified]: boost_rotation_symmetric.F77 Delta lines: +4 -13 =================================================================== --- trunk/src/metrics/boost_rotation_symmetric.F77 2012-10-13 02:29:46 UTC (rev 279) +++ trunk/src/metrics/boost_rotation_symmetric.F77 2012-10-13 02:53:45 UTC (rev 280) @@ -36,29 +36,20 @@ CCTK_REAL gfunc

c local variables + CCTK_REAL h, d, numlim CCTK_REAL a, b, mu0, mu1, lam1, mu2, lam2, $ lam3, mu4, lam4, mu5, lam5, num, div, f, $ elam, emu0, delta, tmp

-c local static variables - logical firstcall - CCTK_REAL h, d, numlim - data firstcall /.true./ - save firstcall, h, d, numlim - C This is a vacuum spacetime with no cosmological constant Tmunu_flag = .false.

C Get parameters of the exact solution.

- if (firstcall) then - h = boost_rotation_symmetric__scale - d = boost_rotation_symmetric__amp - numlim = boost_rotation_symmetric__min_d + h = boost_rotation_symmetric__scale + d = boost_rotation_symmetric__amp + numlim = boost_rotation_symmetric__min_d

- firstcall = .false. - end if - C Intermediate quantities.

a = x**2 + y**2

File [modified]: constant_density_star.F77 Delta lines: +3 -14 =================================================================== --- trunk/src/metrics/constant_density_star.F77 2012-10-13 02:29:46 UTC (rev 279) +++ trunk/src/metrics/constant_density_star.F77 2012-10-13 02:53:45 UTC (rev 280) @@ -44,13 +44,8 @@ CCTK_REAL psi LOGICAL Tmunu_flag

-c local static variables - logical firstcall - CCTK_REAL mass,radius - data firstcall /.true./ - save firstcall, mass, radius - c local variables + CCTK_REAL mass,radius CCTK_REAL r,c,psi4

c constants @@ -63,15 +58,9 @@

c Get parameters of the metric.

- if (firstcall) then + mass = constant_density_star__mass + radius = constant_density_star__radius

- mass = constant_density_star__mass - radius = constant_density_star__radius - - firstcall = .false. - - end if - c Find r.

r = sqrt(x**2 + y**2 + z**2)

File [modified]: de_Sitter.F77 Delta lines: +2 -10 =================================================================== --- trunk/src/metrics/de_Sitter.F77 2012-10-13 02:29:46 UTC (rev 279) +++ trunk/src/metrics/de_Sitter.F77 2012-10-13 02:53:45 UTC (rev 280) @@ -37,23 +37,15 @@ CCTK_REAL psi LOGICAL Tmunu_flag

-c local static variables - logical firstcall - CCTK_REAL arad - data firstcall /.true./ - save firstcall, arad - c local variables + CCTK_REAL arad CCTK_REAL am

C This model has a cosmological constant C ==> it sets the stress-energy tensor in the "CalcTmunu" code Tmunu_flag = .true.

- if (firstcall) then - arad = de_Sitter__scale - firstcall = .false. - end if + arad = de_Sitter__scale

am=arad*t**(4.0D0/3.0D0)

File [modified]: de_Sitter_Lambda.F77 Delta lines: +2 -10 =================================================================== --- trunk/src/metrics/de_Sitter_Lambda.F77 2012-10-13 02:29:46 UTC (rev 279) +++ trunk/src/metrics/de_Sitter_Lambda.F77 2012-10-13 02:53:45 UTC (rev 280) @@ -31,23 +31,15 @@ CCTK_REAL psi LOGICAL Tmunu_flag

-c local static variables - logical firstcall - CCTK_REAL arad - data firstcall /.true./ - save firstcall, arad - c local variables + CCTK_REAL arad CCTK_REAL am

C This model is non-vacuum C ==> it sets the stress-energy tensor in the "CalcTmunu" code Tmunu_flag = .true.

- if (firstcall) then - arad = de_Sitter_Lambda__scale - firstcall = .false. - end if + arad = de_Sitter_Lambda__scale

am=exp(2.0D0*sqrt(arad/3.0d0)*t)