sergio ivp

bugs are fixed


git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/IDAxiOddBrillBH/trunk@35 b6f3ac56-194f-0410-8878-cdf6079d7f1b

4 files changed, 51 insertions, 62 deletions

diff --git a/src/ckerr.x b/src/ckerr.x
index b6dbed5..7d7e754 100644
--- a/src/ckerr.x
+++ b/src/ckerr.x
@@ -1,4 +1,7 @@
-        mass = sqrt(2+sqrt(4+byJ**2))
+        mass = sqrt(2.00000000000000d0 + sqrt(4.0000000000000d0 + byJ**2
+     &  ))
         a = byJ/mass
-        rBL = sqrt(mass**2-a**2)/2*exp(eta(i,j,k))*(1+(mass+a)/(sqrt(mass**2-a**2
-     &  )*exp(eta(i,j,k))))*(1+(mass-a)/(sqrt(mass**2-a**2)*exp(eta(i,j,k))))
+        rBL = 5.0000000000000d-1*exp(eta(i,j,k))*(1.00000000000000d0 + (1.d0*(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
+     &  ass**2))
diff --git a/src/kerr.x b/src/kerr.x
index 57f01b8..b66db76 100644
--- a/src/kerr.x
+++ b/src/kerr.x
@@ -1,4 +1,7 @@
-        mass = sqrt(2+sqrt(4+byJ**2))
+        mass = sqrt(2.00000000000000d0 + sqrt(4.0000000000000d0 + byJ**2
+     &  ))
         a = byJ/mass
-        rBL = sqrt(mass**2-a**2)/2*exp(etagrd(i))*(1+(mass+a)/(sqrt(mass**2-a**2
-     &  )*exp(etagrd(i))))*(1+(mass-a)/(sqrt(mass**2-a**2)*exp(etagrd(i))))
+        rBL = 5.0000000000000d-1*exp(etagrd(i))*(1.00000000000000d0 + (1.d0*(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
+     &  ass**2))
diff --git a/src/kij_sergio.x b/src/kij_sergio.x
index bb73eb5..85ea355 100644
--- a/src/kij_sergio.x
+++ b/src/kij_sergio.x
@@ -16,33 +16,24 @@
         o16 = sin(phi(i,j,k))
         o17 = sin(q(i,j,k))
         o18 = o17**2
-        o19 = -o1
-        o20 = mass**2
-        o21 = o19 + o20
-        o22 = sqrt(o21)
-        o23 = 1/o4
-        o24 = 2.50000000000000d-1*o21*o23
-        o25 = 1.00000000000000d0 + o24
-        o26 = o1 + o4
-        o27 = 2.00000000000000d0*o26*o4
-        o28 = o19 + o4
-        o29 = o11*o28
-        o30 = o27 + o29
-        o31 = -2.00000000000000d0*eta(i,j,k)
-        o32 = exp(o31)
-        o33 = o7**2
-        o34 = o16**2
-        o35 = o17*o18
-        kxx(i,j,k) = -(a*mass*o13*o16*o18*o22*o25*o30*o32*o7) + 4.000000
-     &  0000000d0*mass*o13*o15*o16*o18*o2*o6*o7*o9*rBL
-        kxy(i,j,k) = 5.0000000000000d-1*a*mass*o13*o18*o22*o25*o30*o32*o
-     &  33 - 5.0000000000000d-1*a*mass*o13*o18*o22*o25*o30*o32*o34 - 2.0
-     &  0000000000000d0*mass*o13*o15*o18*o2*o33*o6*o9*rBL + 2.0000000000
-     &  0000d0*mass*o13*o15*o18*o2*o34*o6*o9*rBL
-        kxz(i,j,k) = -5.0000000000000d-1*a*mass*o13*o16*o17*o22*o25*o30*
-     &  o32*o8 - 2.00000000000000d0*mass*o13*o15*o16*o2*o35*o6*o8*rBL
-        kyy(i,j,k) = a*mass*o13*o16*o18*o22*o25*o30*o32*o7 - 4.000000000
-     &  0000d0*mass*o13*o15*o16*o18*o2*o6*o7*o9*rBL
-        kyz(i,j,k) = 5.0000000000000d-1*a*mass*o13*o17*o22*o25*o30*o32*o
-     &  7*o8 + 2.00000000000000d0*mass*o13*o15*o2*o35*o6*o7*o8*rBL
+        o19 = o1 + o4
+        o20 = 2.00000000000000d0*o19*o4
+        o21 = -o1
+        o22 = o21 + o4
+        o23 = o11*o22
+        o24 = o20 + o23
+        o25 = o7**2
+        o26 = o16**2
+        o27 = o17*o18
+        kxx(i,j,k) = -2.00000000000000d0*a*mass*o13*o15*o16*o18*o24*o7 +
+     &   4.0000000000000d0*mass*o13*o15*o16*o18*o2*o6*o7*o9*rBL
+        kxy(i,j,k) = a*mass*o13*o15*o18*o24*o25 - a*mass*o13*o15*o18*o24
+     &  *o26 - 2.00000000000000d0*mass*o13*o15*o18*o2*o25*o6*o9*rBL + 2.
+     &  00000000000000d0*mass*o13*o15*o18*o2*o26*o6*o9*rBL
+        kxz(i,j,k) = -(a*mass*o13*o15*o16*o17*o24*o8) - 2.00000000000000
+     &  d0*mass*o13*o15*o16*o2*o27*o6*o8*rBL
+        kyy(i,j,k) = 2.00000000000000d0*a*mass*o13*o15*o16*o18*o24*o7 - 
+     &  4.0000000000000d0*mass*o13*o15*o16*o18*o2*o6*o7*o9*rBL
+        kyz(i,j,k) = a*mass*o13*o15*o17*o24*o7*o8 + 2.00000000000000d0*m
+     &  ass*o13*o15*o2*o27*o6*o7*o8*rBL
         kzz(i,j,k) = 0
diff --git a/src/ksq_sergio.x b/src/ksq_sergio.x
index 8a6180b..76a947f 100644
--- a/src/ksq_sergio.x
+++ b/src/ksq_sergio.x
@@ -14,36 +14,28 @@
         o14 = 1/o13
         o15 = sin(qgrd(j))
         o16 = o15**2
-        o17 = -o1
-        o18 = mass**2
-        o19 = o17 + o18
-        o20 = sqrt(o19)
-        o21 = 1/o3
-        o22 = 2.50000000000000d-1*o19*o21
-        o23 = 1.00000000000000d0 + o22
-        o24 = o1 + o3
-        o25 = 2.00000000000000d0*o24*o3
-        o26 = o17 + o3
-        o27 = o26*o9
-        o28 = o25 + o27
-        o29 = o23**2
-        o30 = o10**2
-        o31 = 1/o30
-        o32 = o28**2
-        o33 = o13**2
-        o34 = o33**2
-        o35 = o33*o34
-        o36 = 1/o35
-        o37 = o1**2
-        o38 = o16**2
+        o17 = o1 + o3
+        o18 = 2.00000000000000d0*o17*o3
+        o19 = -o1
+        o20 = o19 + o3
+        o21 = o20*o9
+        o22 = o18 + o21
+        o23 = mass**2
+        o24 = o10**2
+        o25 = 1/o24
+        o26 = o22**2
+        o27 = o13**2
+        o28 = o27**2
+        o29 = o27*o28
+        o30 = 1/o29
+        o31 = o1**2
+        o32 = o16**2
 c        exc33(i,j) = 0
 c        exc32(i,j) = -2.00000000000000d0*a*mass*o1*o11*o14*o15*o16*o5*o6
 c     &  *rBL
-c        exc31(i,j) = 5.0000000000000d-1*a*mass*o11*o14*o16*o20*o23*o28*e
-c     &  xp(eta)
+c        exc31(i,j) = a*mass*o11*o14*o16*o22
 c        exc22(i,j) = 0
 c        exc21(i,j) = 0
 c        exc11(i,j) = 0
-        ksq(i,j) = 8.0000000000000d0*o1*o18*o3*o31*o36*o37*o38*o4*o7 + 5
-     &  .0000000000000d-1*o1*o16*o18*o19*o29*o31*o32*o36*exp(2.000000000
-     &  00000d0*etagrd(i))
+        ksq(i,j) = 2.00000000000000d0*o1*o16*o23*o25*o26*o30 + 8.0000000
+     &  000000d0*o1*o23*o25*o3*o30*o31*o32*o4*o7