Replace the specific dexp, dsqrt etc. with the generic exp, sqrt etc.

This increases accuracy for when CCTK_REAL is real*16 and speed when
it is real*4.


git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/Exact/trunk@228 e296648e-0e4f-0410-bd07-d597d9acff87

10 files changed, 21 insertions, 21 deletions

diff --git a/src/metrics/Bertotti.F77 b/src/metrics/Bertotti.F77
index 1a6c9ab..b6f6ab2 100644
--- a/src/metrics/Bertotti.F77
+++ b/src/metrics/Bertotti.F77
@@ -49,8 +49,8 @@ C ==> it sets the stress-energy tensor in the "CalcTmunu" code
           firstcall = .false.
       end if
 
-      unu=exp(2.0D0*dsqrt(-baza)*x)
-      doi=exp(2.0D0*dsqrt(-baza)*z)   
+      unu=exp(2.0D0*sqrt(-baza)*x)
+      doi=exp(2.0D0*sqrt(-baza)*z)   
 
        
       gdtt = -unu
diff --git a/src/metrics/Lemaitre.F77 b/src/metrics/Lemaitre.F77
index 742677f..86dbc9c 100644
--- a/src/metrics/Lemaitre.F77
+++ b/src/metrics/Lemaitre.F77
@@ -59,9 +59,9 @@ c this model sets the stress-energy tensor in the "CalcTmunu" code
 
        Pii = acos(-1.0D0)
 
-       unu = dsqrt(3.0D0*la)*t*(ka+1.0D0)/(2.0D0)
+       unu = sqrt(3.0D0*la)*t*(ka+1.0D0)/(2.0D0)
 
-       ra  = r0*(cosh(unu)+dsqrt(1.0D0+8.0D0*Pii*e0/la)*sinh(unu))**
+       ra  = r0*(cosh(unu)+sqrt(1.0D0+8.0D0*Pii*e0/la)*sinh(unu))**
      &       (2.0D0/(3.0D0*ka+3.0D0)) 
 
        ra2 = ra*ra  
diff --git a/src/metrics/Minkowski_funny.F77 b/src/metrics/Minkowski_funny.F77
index 8bf6846..7e376f3 100644
--- a/src/metrics/Minkowski_funny.F77
+++ b/src/metrics/Minkowski_funny.F77
@@ -66,9 +66,9 @@ c     Find transformation function.
       z2 = z**2
 
       r2 = x2 + y2 + z2
-      r  = dsqrt(r2)
+      r  = sqrt(r2)
 
-      f  = dexp(-r2/s**2)
+      f  = exp(-r2/s**2)
       fp = - two*r/s**2*f
 
 c     Give metric components.
diff --git a/src/metrics/Minkowski_shift.F77 b/src/metrics/Minkowski_shift.F77
index 0c912ad..394bf67 100644
--- a/src/metrics/Minkowski_shift.F77
+++ b/src/metrics/Minkowski_shift.F77
@@ -67,9 +67,9 @@ c     Find transformation function.
       z2 = z**2
 
       r2 = x2 + y2 + z2
-      r  = dsqrt(r2)
+      r  = sqrt(r2)
 
-      f    = a*dexp(-r2/s**2)
+      f    = a*exp(-r2/s**2)
       fp   = - two*f*r/s**2
       fpr  = fp/r
       fpr2 = fpr**2
diff --git a/src/metrics/Schwarzschild_Lemaitre.F77 b/src/metrics/Schwarzschild_Lemaitre.F77
index 844975d..7f6b0c3 100644
--- a/src/metrics/Schwarzschild_Lemaitre.F77
+++ b/src/metrics/Schwarzschild_Lemaitre.F77
@@ -54,7 +54,7 @@ C This model has a cosmological constant
  
       r2 =x*x+y*y+z*z
 
-      ppp=1.0D0 -2.0D0*mas/dsqrt(r2) -r2*lam/3.0D0
+      ppp=1.0D0 -2.0D0*mas/sqrt(r2) -r2*lam/3.0D0
 
       unu=(1.0D0-ppp)/ppp/r2      
  
diff --git a/src/metrics/Schwarzschild_Novikov.F77 b/src/metrics/Schwarzschild_Novikov.F77
index 6446790..2f2a1ec 100644
--- a/src/metrics/Schwarzschild_Novikov.F77
+++ b/src/metrics/Schwarzschild_Novikov.F77
@@ -71,7 +71,7 @@ C     Get parameters of the exact solution.
       r = max(sqrt(x**2 + y**2 + z**2), eps)
 
 c     Find r.
-      r = dsqrt(x**2 + y**2 + z**2)
+      r = sqrt(x**2 + y**2 + z**2)
 
 c     Find conformal factor.
       c = mass/(two*r)
@@ -202,9 +202,9 @@ c     Evaluate tau as a function of r and rmax
       implicit none
       CCTK_REAL r, rmax
 
-      nov_tau=  rmax * dsqrt(0.5D0 * r * (1.0D0 - r / rmax)) +
+      nov_tau=  rmax * sqrt(0.5D0 * r * (1.0D0 - r / rmax)) +
      $     2.0D0 * (rmax / 2)**(3.0/2.0) *
-     $     acos (dsqrt(r/rmax))
+     $     acos (sqrt(r/rmax))
 
       return
       end
diff --git a/src/metrics/anti_de_Sitter_Lambda.F77 b/src/metrics/anti_de_Sitter_Lambda.F77
index 70799b0..022a41d 100644
--- a/src/metrics/anti_de_Sitter_Lambda.F77
+++ b/src/metrics/anti_de_Sitter_Lambda.F77
@@ -48,7 +48,7 @@ C This model has a cosmological constant
           firstcall = .false.
       end if
 
-      am=exp(2.0D0*dsqrt(-arad/3.0D0)*x)   
+      am=exp(2.0D0*sqrt(-arad/3.0D0)*x)   
        
       gdtt = -am 
       gdtx = 0.0D0 
diff --git a/src/metrics/bowl.F77 b/src/metrics/bowl.F77
index e70aad3..d4b2da6 100644
--- a/src/metrics/bowl.F77
+++ b/src/metrics/bowl.F77
@@ -145,7 +145,7 @@ c     1 so that far in the past we will always have flat space, and
 c     far in the future we will have the static bowl.
 
       if (evolve) then
-         tfac = one/(one + dexp(-st*(t-t0)))
+         tfac = one/(one + exp(-st*(t-t0)))
       else
          tfac = one
       end if
@@ -155,7 +155,7 @@ c     far in the future we will have the static bowl.
 c     Find {r2,r}.
 
       r2 = (x/dx)**2 + (y/dy)**2 + (z/dz)**2
-      r  = dsqrt(r2)
+      r  = sqrt(r2)
 
 c     Find the form function rr2
 c
@@ -178,8 +178,8 @@ c        This goes smoothly to 0 at the origin, and climbs
 c        fast to a limiting value of 1 (at r=1 it is already
 c        equal to 0.96).
 
-         fac = one - two/(dexp(4.0d0*r) + dexp(-4.0d0*r))
-         rr2 = (one - a*fac*dexp(-((r-c)/s)**2)/r)**2
+         fac = one - two/(exp(4.0d0*r) + exp(-4.0d0*r))
+         rr2 = (one - a*fac*exp(-((r-c)/s)**2)/r)**2
 
       else if (type.eq.2) then
 
@@ -190,8 +190,8 @@ c
 c        Again, this doesnt really go to 1 at the origin, so
 c        I use the same trick as above.
 
-         fac = one - two/(dexp(4.0d0*r) + dexp(-4.0d0*r))
-         rr2 = (one - a*fac/(one + dexp(-s*(r-c)))/r)**2
+         fac = one - two/(exp(4.0d0*r) + exp(-4.0d0*r))
+         rr2 = (one - a*fac/(one + exp(-s*(r-c)))/r)**2
 
       else
          write (warn_buffer, '(a,i8)')
diff --git a/src/metrics/constant_density_star.F77 b/src/metrics/constant_density_star.F77
index bf90783..8aff0e5 100644
--- a/src/metrics/constant_density_star.F77
+++ b/src/metrics/constant_density_star.F77
@@ -74,7 +74,7 @@ c     Get parameters of the metric.
 
 c     Find r.
 
-      r = dsqrt(x**2 + y**2 + z**2)
+      r = sqrt(x**2 + y**2 + z**2)
 
 c     Find conformal factor.
 
diff --git a/src/metrics/de_Sitter_Lambda.F77 b/src/metrics/de_Sitter_Lambda.F77
index 87e3019..46d0cf5 100644
--- a/src/metrics/de_Sitter_Lambda.F77
+++ b/src/metrics/de_Sitter_Lambda.F77
@@ -49,7 +49,7 @@ C ==> it sets the stress-energy tensor in the "CalcTmunu" code
           firstcall = .false.
       end if
 
-      am=exp(2.0D0*dsqrt(arad/3.0d0)*t)   
+      am=exp(2.0D0*sqrt(arad/3.0d0)*t)   
 
       gdtt = -1.d0 
       gdtx = 0.d0