some small portability mods (run through mint)

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

6 files changed, 26 insertions, 25 deletions

diff --git a/src/maple/Diff.maple b/src/maple/Diff.maple
index c21d79b..9061215 100644
--- a/src/maple/Diff.maple
+++ b/src/maple/Diff.maple
@@ -101,7 +101,6 @@ option remember;		# performance optimization
 local var_list,
       nn, nderiv,
       op_cdr,
-      abs_operand,
       f, g, x, x_car, x_cdr, temp,
       n,
       inner_operand, inner_var_list, k,
@@ -245,7 +244,8 @@ end proc;
 proc(operand)			# varargs
 option remember;		# performance optimization
 global
-       @include "../maple/coords.minc";
+       @include "../maple/coords.minc",
+       @include "../maple/coeffs.minc";
 local var_list, posn;
 
 var_list := [args[2..nargs]];
diff --git a/src/maple/coeffs.maple b/src/maple/coeffs.maple
index de07b8e..123a494 100644
--- a/src/maple/coeffs.maple
+++ b/src/maple/coeffs.maple
@@ -16,12 +16,13 @@ setup_coeff_gfas :=
 proc()
 global
 @include "coords.minc",
-@include "coeffs.minc";
+@include "coeffs.minc",
+@include "gfa.minc";
 
 # 1st ($X^u_i$) and 2nd ($X^u_{ij}$) partial derivs
 # of (r,rho,sigma) wrt (xx,yy,zz)
-make_gfa('X_ud', {inert}, [A_min..N, 1..N], none);
-make_gfa('X_udd', {inert}, [A_min..N, 1..N, 1..N], symmetric3_23);
+make_gfa('X_ud', {inert}, [1..N_ang, 1..N], none);
+make_gfa('X_udd', {inert}, [1..N_ang, 1..N, 1..N], symmetric3_23);
 
 NULL;
 end proc;
diff --git a/src/maple/coeffs.minc b/src/maple/coeffs.minc
index c7ff962..44b7517 100644
--- a/src/maple/coeffs.minc
+++ b/src/maple/coeffs.minc
@@ -3,5 +3,5 @@
 
 # coordinate-transformation coefficient gfas
 X_ud, X_ud__fnd,
-X_udd, X_udd_fnd
-		# no comma
+X_udd, X_udd__fnd
+	# no comma
diff --git a/src/maple/coords.maple b/src/maple/coords.maple
index 78afb3e..68adbb1 100644
--- a/src/maple/coords.maple
+++ b/src/maple/coords.maple
@@ -2,28 +2,12 @@
 # $Id$
 
 #
-# setup_delta - set up the Kronecker delta
 # setup_coords - set up coordinates
 #
 
 ###############################################################################
 
 #
-# This function sets up the Kronecker delta.
-#
-delta :=
-proc(i::algebraic, j::algebraic)
-if (type(i,integer) and type(j,integer))
-   then return `if`(i = j, 1, 0);
-fi;
-
-# unevaluated return if we don't have integer arguments
-return 'delta'(i,j);
-end proc;
-
-###############################################################################
-
-#
 # This function sets up the coordinates.
 #
 setup_coords :=
@@ -36,6 +20,9 @@ N := 3;					# number of spatial coordinates,
 					#      are 1..N
 N_ang := 2;				# number of angular spatial coordinates
 
+# Kronecker delta
+delta := array(1..N, 1..N, identity);
+
 # (x,y,z) coordinates
 x_xyz := array(1..N);
 x_xyz[1] := xx;
@@ -43,11 +30,14 @@ x_xyz[2] := yy;
 x_xyz[3] := zz;
 x_xyz_list := map(op, [entries(x_xyz)]);
 
+# r coordinate
+r__fnd := sqrt(xx^2 + yy^2 + zz^2, symbolic);
+
 # (rho,sigma) coordinates
 y_rs := array(1..N_ang);
 y_rs[1] := rho;
 y_rs[2] := sigma;
-x_rrs_list := map(op, [entries(y_rs)]);
+y_rs_list := map(op, [entries(y_rs)]);
 
 # list of all coordinates (for sorting things into "nice" order)
 x_all_list := [op(x_xyz_list), op(y_rs_list)];
diff --git a/src/maple/coords.minc b/src/maple/coords.minc
index f6225a0..03c01ec 100644
--- a/src/maple/coords.minc
+++ b/src/maple/coords.minc
@@ -1,10 +1,13 @@
 # coords.minc -- global variables for coordinates
 # $Id$
 
+# Kronecker delta
+delta,
+
 # coordinates
 N,			# number of spatial coordinates
 N_ang,			# number of angular spatial coordinates
-delta,			# Kronecker delta
+r, r__fnd,		# radial coordinate, inert and as fn(xx,yy,zz) coords
 x_xyz, x_xyz_list,	# array and list of (xx,yy,zz) coordinates
 y_rs, y_rs_list,	# array and list of (rho,sigma) coordinates
 rho, sigma,		# individual patch coordinates
diff --git a/src/maple/gfa.minc b/src/maple/gfa.minc
new file mode 100644
index 0000000..2cf99f7
--- /dev/null
+++ b/src/maple/gfa.minc
@@ -0,0 +1,7 @@
+# gfa.minc -- global variables for gridfn array system
+# $Id$
+
+# arguments to make_gfa
+inert, none,
+symmetric3_23
+	# no comma