oops, needed to change the C++ code to actually *use* the new Maple output!

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/AHFinderDirect/trunk@347 f88db872-0e4f-0410-b76b-b9085cfa78c5

1 files changed, 49 insertions, 68 deletions

diff --git a/src/patch/test_patch_system.out b/src/patch/test_patch_system.out
index be3ea52..aada958 100644
--- a/src/patch/test_patch_system.out
+++ b/src/patch/test_patch_system.out
@@ -4,7 +4,7 @@
  <____ ____>  Waterloo Maple Inc.
       |       Type ? for help.
 # test_patch_system.maple -- test function for  test_fd_grid
-# $Id: test_patch_system.maple,v 1.3 2001/09/09 14:04:04 jthorn Exp $
+# $Id: test_patch_system.maple,v 1.4 2001/09/15 18:06:33 jthorn Exp $
 > 
 # test function
 > fn := exp(sin(1.38*rho)) * tanh(0.17+0.83*sin(sigma)^2);
@@ -13,76 +13,57 @@
 
 > 
 # 1st derivatives
-> simplify(diff(fn, rho));		codegen[C](%);
--1.380000000000000 cos(1.380000000000000 rho) exp(sin(1.380000000000000 rho))
+> diff(fn, rho);			codegen[C](%);
+                                                                      2
+       1.38 cos(1.38 rho) exp(sin(1.38 rho)) tanh(.17 + .83 sin(sigma) )
 
-                                           2    /
-    sinh(-1. + .8300000000000000 cos(sigma) )  /
-                                              /
+      t0 = 0.138E1*cos(0.138E1*rho)*exp(sin(0.138E1*rho))*tanh(0.17+0.83*pow(
+sin(sigma),2.0));
+> diff(fn, sigma);		codegen[C](%);
+1.66
 
-                                           2
-    cosh(-1. + .8300000000000000 cos(sigma) )
+                                                     2 2
+    exp(sin(1.38 rho)) (1 - tanh(.17 + .83 sin(sigma) ) ) sin(sigma) cos(sigma)
 
-      t0 = -0.138E1*cos(0.138E1*rho)*exp(sin(0.138E1*rho))*sinh(-1.0+0.83*pow(
-cos(sigma),2.0))/cosh(-1.0+0.83*pow(cos(sigma),2.0));
-> simplify(diff(fn, sigma));		codegen[C](%);
-                      exp(sin(1.380000000000000 rho)) sin(sigma) cos(sigma)
-    1.660000000000000 -----------------------------------------------------
-                                                                  2 2
-                           cosh(-1. + .8300000000000000 cos(sigma) )
-
-      t0 = 0.166E1*exp(sin(0.138E1*rho))*sin(sigma)*cos(sigma)/pow(cosh(-1.0+
-0.83*pow(cos(sigma),2.0)),2.0);
+      t0 = 0.166E1*exp(sin(0.138E1*rho))*(1.0-pow(tanh(0.17+0.83*pow(sin(sigma)
+,2.0)),2.0))*sin(sigma)*cos(sigma);
 > 
 # 2nd derivatives
-> simplify(diff(fn, rho,rho));		codegen[C](%);
-bytes used=2000136, alloc=1834672, time=0.15
-1.904400000000000 exp(sin(1.380000000000000 rho))
-
-                                           2
-    sinh(-1. + .8300000000000000 cos(sigma) )
-
-                                                               2    /
-    (sin(1.380000000000000 rho) - 1. cos(1.380000000000000 rho) )  /
-                                                                  /
-
-                                           2
-    cosh(-1. + .8300000000000000 cos(sigma) )
-
-      t0 = 0.19044E1*exp(sin(0.138E1*rho))*sinh(-1.0+0.83*pow(cos(sigma),2.0))*
-(sin(0.138E1*rho)-1.0*pow(cos(0.138E1*rho),2.0))/cosh(-1.0+0.83*pow(cos(sigma),
-2.0));
-> simplify(diff(fn, rho,sigma));		codegen[C](%);
-2.290800000000000 cos(1.380000000000000 rho) exp(sin(1.380000000000000 rho))
-
-                                                                 2 2
-    sin(sigma) cos(sigma)/cosh(-1. + .8300000000000000 cos(sigma) )
-
-      t0 = 0.22908E1*cos(0.138E1*rho)*exp(sin(0.138E1*rho))*sin(sigma)*cos(
-sigma)/pow(cosh(-1.0+0.83*pow(cos(sigma),2.0)),2.0);
-> simplify(diff(fn, sigma,sigma));	codegen[C](%);
--.06640000000000000 exp(sin(1.380000000000000 rho)) (
-
-                                                2            2
-    -83. sinh(-1. + .8300000000000000 cos(sigma) ) cos(sigma)
-
-                                                  2            4
-     + 83. sinh(-1. + .8300000000000000 cos(sigma) ) cos(sigma)
-
-                     2                                        2
-     - 50. cos(sigma)  cosh(-1. + .8300000000000000 cos(sigma) )
-
-                                                  2     /
-     + 25. cosh(-1. + .8300000000000000 cos(sigma) ))  /
-                                                      /
-
-                                           2 3
-    cosh(-1. + .8300000000000000 cos(sigma) )
-
-      t0 = -0.664E-1*exp(sin(0.138E1*rho))*(-83.0*sinh(-1.0+0.83*pow(cos(sigma)
-,2.0))*pow(cos(sigma),2.0)+83.0*sinh(-1.0+0.83*pow(cos(sigma),2.0))*pow(cos(
-sigma),4.0)-50.0*pow(cos(sigma),2.0)*cosh(-1.0+0.83*pow(cos(sigma),2.0))+25.0*
-cosh(-1.0+0.83*pow(cos(sigma),2.0)))/pow(cosh(-1.0+0.83*pow(cos(sigma),2.0)),
-3.0);
+> diff(fn, rho,rho);		codegen[C](%);
+                                                                  2
+-1.9044 sin(1.38 rho) exp(sin(1.38 rho)) tanh(.17 + .83 sin(sigma) )
+
+                           2                                             2
+     + 1.9044 cos(1.38 rho)  exp(sin(1.38 rho)) tanh(.17 + .83 sin(sigma) )
+
+      t0 = -0.19044E1*sin(0.138E1*rho)*exp(sin(0.138E1*rho))*tanh(0.17+0.83*pow
+(sin(sigma),2.0))+0.19044E1*pow(cos(0.138E1*rho),2.0)*exp(sin(0.138E1*rho))*
+tanh(0.17+0.83*pow(sin(sigma),2.0));
+> diff(fn, rho,sigma);		codegen[C](%);
+                                                                      2 2
+2.2908 cos(1.38 rho) exp(sin(1.38 rho)) (1 - tanh(.17 + .83 sin(sigma) ) )
+
+    sin(sigma) cos(sigma)
+
+      t0 = 0.22908E1*cos(0.138E1*rho)*exp(sin(0.138E1*rho))*(1.0-pow(tanh(0.17+
+0.83*pow(sin(sigma),2.0)),2.0))*sin(sigma)*cos(sigma);
+> diff(fn, sigma,sigma);		codegen[C](%);
+                                                    2
+-5.5112 exp(sin(1.38 rho)) tanh(.17 + .83 sin(sigma) )
+
+                                  2 2            2           2
+    (1 - tanh(.17 + .83 sin(sigma) ) ) sin(sigma)  cos(sigma)
+
+                                                             2 2            2
+     + 1.66 exp(sin(1.38 rho)) (1 - tanh(.17 + .83 sin(sigma) ) ) cos(sigma)
+
+                                                             2 2            2
+     - 1.66 exp(sin(1.38 rho)) (1 - tanh(.17 + .83 sin(sigma) ) ) sin(sigma)
+
+      t0 = -0.55112E1*exp(sin(0.138E1*rho))*tanh(0.17+0.83*pow(sin(sigma),2.0))
+*(1.0-pow(tanh(0.17+0.83*pow(sin(sigma),2.0)),2.0))*pow(sin(sigma),2.0)*pow(cos
+(sigma),2.0)+0.166E1*exp(sin(0.138E1*rho))*(1.0-pow(tanh(0.17+0.83*pow(sin(
+sigma),2.0)),2.0))*pow(cos(sigma),2.0)-0.166E1*exp(sin(0.138E1*rho))*(1.0-pow(
+tanh(0.17+0.83*pow(sin(sigma),2.0)),2.0))*pow(sin(sigma),2.0);
 > quit
-bytes used=3055016, alloc=1965720, time=0.24
+bytes used=1170560, alloc=1179432, time=0.10