There are 3 changes in this commit

* Add code to print C assignments of the form
	COEFF(-1,1) = coeff_dx_m1_p1;
  etc
* change all functions which print to name files to now explicit close
  the files when they're done -- previously we just left the files open,
  and relied on Maple's implicit close-on-exit :(
* reformat whitespace in [123]d.maple


git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/LocalInterp/trunk@36 df1f8a13-aa1d-4dd4-9681-27ded5b42416

5 files changed, 441 insertions, 227 deletions

diff --git a/src/GeneralizedPolynomial-Uniform/1d.maple b/src/GeneralizedPolynomial-Uniform/1d.maple
index 5125fe8..8c9e23a 100644
--- a/src/GeneralizedPolynomial-Uniform/1d.maple
+++ b/src/GeneralizedPolynomial-Uniform/1d.maple
@@ -74,15 +74,22 @@ posn_list_1d_size7 := map(ListTools[Reverse], hypercube_points([-3], [+3]));
 
 data_var_list_1d_size2 := map(data_var_name, posn_list_1d_size2, "data_");
 
-print_name_list_dcl(data_var_list_1d_size2,
-		    "fp", "1d.coeffs/1d.cube.size2/data-var.dcl.c");
-print_data_var_assign(posn_list_1d_size2,
-		      "data_", "1d.coeffs/1d.cube.size2/data-var.assign.c");
-
-print_name_list_dcl(map(coeff_name, posn_list_1d_size2, "coeff_I_"),
-		    "fp", "1d.coeffs/1d.cube.size2/coeff-I.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_1d_size2, "coeff_dx_"),
-		    "fp", "1d.coeffs/1d.cube.size2/coeff-dx.dcl.c");
+print_name_list_dcl(data_var_list_1d_size2, "fp",
+		    "1d.coeffs/1d.cube.size2/data-var.dcl.c");
+print_data_var_assign(posn_list_1d_size2, "data_",
+		      "1d.coeffs/1d.cube.size2/data-var.assign.c");
+
+print_interp_coeff_var_store(posn_list_1d_size2, "coeff_I_",
+			     "1d.coeffs/1d.cube.size2/coeff-I.store.c");
+print_interp_coeff_var_store(posn_list_1d_size2, "coeff_dx_",
+			     "1d.coeffs/1d.cube.size2/coeff-dx.store.c");
+print_interp_coeff_var_store(posn_list_1d_size2, "coeff_dxx_",
+			     "1d.coeffs/1d.cube.size2/coeff-dxx.store.c");
+
+print_name_list_dcl(map(coeff_name, posn_list_1d_size2, "coeff_I_"), "fp",
+		    "1d.coeffs/1d.cube.size2/coeff-I.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_1d_size2, "coeff_dx_"), "fp",
+		    "1d.coeffs/1d.cube.size2/coeff-dx.dcl.c");
 
 print_interp_cmpt__lc_of_data(posn_list_1d_size2,
 			      "result", "coeff_I_", "data_",
@@ -99,17 +106,24 @@ print_interp_cmpt__lc_of_data(posn_list_1d_size2,
 
 data_var_list_1d_size3 := map(data_var_name, posn_list_1d_size3, "data_");
 
-print_name_list_dcl(data_var_list_1d_size3,
-		    "fp", "1d.coeffs/1d.cube.size3/data-var.dcl.c");
-print_data_var_assign(posn_list_1d_size3,
-		      "data_", "1d.coeffs/1d.cube.size3/data-var.assign.c");
-
-print_name_list_dcl(map(coeff_name, posn_list_1d_size3, "coeff_I_"),
-		    "fp", "1d.coeffs/1d.cube.size3/coeff-I.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_1d_size3, "coeff_dx_"),
-		    "fp", "1d.coeffs/1d.cube.size3/coeff-dx.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_1d_size3, "coeff_dxx_"),
-		    "fp", "1d.coeffs/1d.cube.size3/coeff-dxx.dcl.c");
+print_name_list_dcl(data_var_list_1d_size3, "fp",
+		    "1d.coeffs/1d.cube.size3/data-var.dcl.c");
+print_data_var_assign(posn_list_1d_size3, "data_",
+		      "1d.coeffs/1d.cube.size3/data-var.assign.c");
+
+print_interp_coeff_var_store(posn_list_1d_size3, "coeff_I_",
+			     "1d.coeffs/1d.cube.size3/coeff-I.store.c");
+print_interp_coeff_var_store(posn_list_1d_size3, "coeff_dx_",
+			     "1d.coeffs/1d.cube.size3/coeff-dx.store.c");
+print_interp_coeff_var_store(posn_list_1d_size3, "coeff_dxx_",
+			     "1d.coeffs/1d.cube.size3/coeff-dxx.store.c");
+
+print_name_list_dcl(map(coeff_name, posn_list_1d_size3, "coeff_I_"), "fp",
+		    "1d.coeffs/1d.cube.size3/coeff-I.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_1d_size3, "coeff_dx_"), "fp",
+		    "1d.coeffs/1d.cube.size3/coeff-dx.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_1d_size3, "coeff_dxx_"), "fp",
+		    "1d.coeffs/1d.cube.size3/coeff-dxx.dcl.c");
 
 print_interp_cmpt__lc_of_data(posn_list_1d_size3,
 			      "result", "coeff_I_", "data_",
@@ -129,17 +143,24 @@ print_interp_cmpt__lc_of_data(posn_list_1d_size3,
 
 data_var_list_1d_size4 := map(data_var_name, posn_list_1d_size4, "data_");
 
-print_name_list_dcl(data_var_list_1d_size4,
-		    "fp", "1d.coeffs/1d.cube.size4/data-var.dcl.c");
-print_data_var_assign(posn_list_1d_size4,
-		      "data_", "1d.coeffs/1d.cube.size4/data-var.assign.c");
-
-print_name_list_dcl(map(coeff_name, posn_list_1d_size4, "coeff_I_"),
-		    "fp", "1d.coeffs/1d.cube.size4/coeff-I.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_1d_size4, "coeff_dx_"),
-		    "fp", "1d.coeffs/1d.cube.size4/coeff-dx.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_1d_size4, "coeff_dxx_"),
-		    "fp", "1d.coeffs/1d.cube.size4/coeff-dxx.dcl.c");
+print_name_list_dcl(data_var_list_1d_size4, "fp",
+		    "1d.coeffs/1d.cube.size4/data-var.dcl.c");
+print_data_var_assign(posn_list_1d_size4, "data_",
+		      "1d.coeffs/1d.cube.size4/data-var.assign.c");
+
+print_interp_coeff_var_store(posn_list_1d_size4, "coeff_I_",
+			     "1d.coeffs/1d.cube.size4/coeff-I.store.c");
+print_interp_coeff_var_store(posn_list_1d_size4, "coeff_dx_",
+			     "1d.coeffs/1d.cube.size4/coeff-dx.store.c");
+print_interp_coeff_var_store(posn_list_1d_size4, "coeff_dxx_",
+			     "1d.coeffs/1d.cube.size4/coeff-dxx.store.c");
+
+print_name_list_dcl(map(coeff_name, posn_list_1d_size4, "coeff_I_"), "fp",
+		    "1d.coeffs/1d.cube.size4/coeff-I.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_1d_size4, "coeff_dx_"), "fp",
+		    "1d.coeffs/1d.cube.size4/coeff-dx.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_1d_size4, "coeff_dxx_"), "fp",
+		    "1d.coeffs/1d.cube.size4/coeff-dxx.dcl.c");
 
 print_interp_cmpt__lc_of_data(posn_list_1d_size4,
 			      "result", "coeff_I_", "data_",
@@ -159,17 +180,24 @@ print_interp_cmpt__lc_of_data(posn_list_1d_size4,
 
 data_var_list_1d_size5 := map(data_var_name, posn_list_1d_size5, "data_");
 
-print_name_list_dcl(data_var_list_1d_size5,
-		    "fp", "1d.coeffs/1d.cube.size5/data-var.dcl.c");
-print_data_var_assign(posn_list_1d_size5,
-		      "data_", "1d.coeffs/1d.cube.size5/data-var.assign.c");
-
-print_name_list_dcl(map(coeff_name, posn_list_1d_size5, "coeff_I_"),
-		    "fp", "1d.coeffs/1d.cube.size5/coeff-I.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_1d_size5, "coeff_dx_"),
-		    "fp", "1d.coeffs/1d.cube.size5/coeff-dx.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_1d_size5, "coeff_dxx_"),
-		    "fp", "1d.coeffs/1d.cube.size5/coeff-dxx.dcl.c");
+print_name_list_dcl(data_var_list_1d_size5, "fp",
+		    "1d.coeffs/1d.cube.size5/data-var.dcl.c");
+print_data_var_assign(posn_list_1d_size5, "data_",
+		      "1d.coeffs/1d.cube.size5/data-var.assign.c");
+
+print_interp_coeff_var_store(posn_list_1d_size5, "coeff_I_",
+			     "1d.coeffs/1d.cube.size5/coeff-I.store.c");
+print_interp_coeff_var_store(posn_list_1d_size5, "coeff_dx_",
+			     "1d.coeffs/1d.cube.size5/coeff-dx.store.c");
+print_interp_coeff_var_store(posn_list_1d_size5, "coeff_dxx_",
+			     "1d.coeffs/1d.cube.size5/coeff-dxx.store.c");
+
+print_name_list_dcl(map(coeff_name, posn_list_1d_size5, "coeff_I_"), "fp",
+		    "1d.coeffs/1d.cube.size5/coeff-I.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_1d_size5, "coeff_dx_"), "fp",
+		    "1d.coeffs/1d.cube.size5/coeff-dx.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_1d_size5, "coeff_dxx_"), "fp",
+		    "1d.coeffs/1d.cube.size5/coeff-dxx.dcl.c");
 
 print_interp_cmpt__lc_of_data(posn_list_1d_size5,
 			      "result", "coeff_I_", "data_",
@@ -189,17 +217,24 @@ print_interp_cmpt__lc_of_data(posn_list_1d_size5,
 
 data_var_list_1d_size6 := map(data_var_name, posn_list_1d_size6, "data_");
 
-print_name_list_dcl(data_var_list_1d_size6,
-		    "fp", "1d.coeffs/1d.cube.size6/data-var.dcl.c");
-print_data_var_assign(posn_list_1d_size6,
-		      "data_", "1d.coeffs/1d.cube.size6/data-var.assign.c");
-
-print_name_list_dcl(map(coeff_name, posn_list_1d_size6, "coeff_I_"),
-		    "fp", "1d.coeffs/1d.cube.size6/coeff-I.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_1d_size6, "coeff_dx_"),
-		    "fp", "1d.coeffs/1d.cube.size6/coeff-dx.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_1d_size6, "coeff_dxx_"),
-		    "fp", "1d.coeffs/1d.cube.size6/coeff-dxx.dcl.c");
+print_name_list_dcl(data_var_list_1d_size6, "fp",
+		    "1d.coeffs/1d.cube.size6/data-var.dcl.c");
+print_data_var_assign(posn_list_1d_size6, "data_",
+		      "1d.coeffs/1d.cube.size6/data-var.assign.c");
+
+print_interp_coeff_var_store(posn_list_1d_size6, "coeff_I_",
+			     "1d.coeffs/1d.cube.size6/coeff-I.store.c");
+print_interp_coeff_var_store(posn_list_1d_size6, "coeff_dx_",
+			     "1d.coeffs/1d.cube.size6/coeff-dx.store.c");
+print_interp_coeff_var_store(posn_list_1d_size6, "coeff_dxx_",
+			     "1d.coeffs/1d.cube.size6/coeff-dxx.store.c");
+
+print_name_list_dcl(map(coeff_name, posn_list_1d_size6, "coeff_I_"), "fp",
+		    "1d.coeffs/1d.cube.size6/coeff-I.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_1d_size6, "coeff_dx_"), "fp",
+		    "1d.coeffs/1d.cube.size6/coeff-dx.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_1d_size6, "coeff_dxx_"), "fp",
+		    "1d.coeffs/1d.cube.size6/coeff-dxx.dcl.c");
 
 print_interp_cmpt__lc_of_data(posn_list_1d_size6,
 			      "result", "coeff_I_", "data_",
@@ -219,17 +254,24 @@ print_interp_cmpt__lc_of_data(posn_list_1d_size6,
 
 data_var_list_1d_size7 := map(data_var_name, posn_list_1d_size7, "data_");
 
-print_name_list_dcl(data_var_list_1d_size7,
-		    "fp", "1d.coeffs/1d.cube.size7/data-var.dcl.c");
-print_data_var_assign(posn_list_1d_size7,
-		      "data_", "1d.coeffs/1d.cube.size7/data-var.assign.c");
-
-print_name_list_dcl(map(coeff_name, posn_list_1d_size7, "coeff_I_"),
-		    "fp", "1d.coeffs/1d.cube.size7/coeff-I.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_1d_size7, "coeff_dx_"),
-		    "fp", "1d.coeffs/1d.cube.size7/coeff-dx.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_1d_size7, "coeff_dxx_"),
-		    "fp", "1d.coeffs/1d.cube.size7/coeff-dxx.dcl.c");
+print_name_list_dcl(data_var_list_1d_size7, "fp",
+		    "1d.coeffs/1d.cube.size7/data-var.dcl.c");
+print_data_var_assign(posn_list_1d_size7, "data_",
+		      "1d.coeffs/1d.cube.size7/data-var.assign.c");
+
+print_interp_coeff_var_store(posn_list_1d_size7, "coeff_I_",
+			     "1d.coeffs/1d.cube.size7/coeff-I.store.c");
+print_interp_coeff_var_store(posn_list_1d_size7, "coeff_dx_",
+			     "1d.coeffs/1d.cube.size7/coeff-dx.store.c");
+print_interp_coeff_var_store(posn_list_1d_size7, "coeff_dxx_",
+			     "1d.coeffs/1d.cube.size7/coeff-dxx.store.c");
+
+print_name_list_dcl(map(coeff_name, posn_list_1d_size7, "coeff_I_"), "fp",
+		    "1d.coeffs/1d.cube.size7/coeff-I.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_1d_size7, "coeff_dx_"), "fp",
+		    "1d.coeffs/1d.cube.size7/coeff-dx.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_1d_size7, "coeff_dxx_"), "fp",
+		    "1d.coeffs/1d.cube.size7/coeff-dxx.dcl.c");
 
 print_interp_cmpt__lc_of_data(posn_list_1d_size7,
 			      "result", "coeff_I_", "data_",
@@ -403,4 +445,4 @@ coeff_as_lc_of_data(%, posn_list_1d_size7);
 print_coeff__lc_of_data(%, "coeff_dxx_", "fp",
 			"1d.coeffs/1d.cube.order6.smooth0/coeff-dxx.compute.c");
 
-########################################
+################################################################################
diff --git a/src/GeneralizedPolynomial-Uniform/2d.maple b/src/GeneralizedPolynomial-Uniform/2d.maple
index 719c913..87aa222 100644
--- a/src/GeneralizedPolynomial-Uniform/2d.maple
+++ b/src/GeneralizedPolynomial-Uniform/2d.maple
@@ -75,10 +75,14 @@ coeff_list_2d_order4 := [
 coord_list_2d := [x,y];
 
 # generate points in Fortran ordering
-posn_list_2d_size2 := map(ListTools[Reverse], hypercube_points([ 0, 0], [+1,+1]));
-posn_list_2d_size3 := map(ListTools[Reverse], hypercube_points([-1,-1], [+1,+1]));
-posn_list_2d_size4 := map(ListTools[Reverse], hypercube_points([-1,-1], [+2,+2]));
-posn_list_2d_size5 := map(ListTools[Reverse], hypercube_points([-2,-2], [+2,+2]));
+posn_list_2d_size2 := map(ListTools[Reverse],
+			  hypercube_points([ 0, 0], [+1,+1]));
+posn_list_2d_size3 := map(ListTools[Reverse],
+			  hypercube_points([-1,-1], [+1,+1]));
+posn_list_2d_size4 := map(ListTools[Reverse],
+			  hypercube_points([-1,-1], [+2,+2]));
+posn_list_2d_size5 := map(ListTools[Reverse],
+			  hypercube_points([-2,-2], [+2,+2]));
 
 ################################################################################
 
@@ -88,17 +92,24 @@ posn_list_2d_size5 := map(ListTools[Reverse], hypercube_points([-2,-2], [+2,+2])
 
 data_var_list_2d_size2 := map(data_var_name, posn_list_2d_size2, "data_");
 
-print_name_list_dcl(data_var_list_2d_size2,
-		    "fp", "2d.coeffs/2d.cube.size2/data-var.dcl.c");
-print_data_var_assign(posn_list_2d_size2,
-		      "data_", "2d.coeffs/2d.cube.size2/data-var.assign.c");
-
-print_name_list_dcl(map(coeff_name, posn_list_2d_size2, "coeff_I_"),
-		    "fp", "2d.coeffs/2d.cube.size2/coeff-I.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_2d_size2, "coeff_dx_"),
-		    "fp", "2d.coeffs/2d.cube.size2/coeff-dx.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_2d_size2, "coeff_dy_"),
-		    "fp", "2d.coeffs/2d.cube.size2/coeff-dy.dcl.c");
+print_name_list_dcl(data_var_list_2d_size2, "fp",
+		    "2d.coeffs/2d.cube.size2/data-var.dcl.c");
+print_data_var_assign(posn_list_2d_size2, "data_",
+		      "2d.coeffs/2d.cube.size2/data-var.assign.c");
+
+print_interp_coeff_var_store(posn_list_2d_size2, "coeff_I_",
+			     "2d.coeffs/2d.cube.size2/coeff-I.store.c");
+print_interp_coeff_var_store(posn_list_2d_size2, "coeff_dx_",
+			     "2d.coeffs/2d.cube.size2/coeff-dx.store.c");
+print_interp_coeff_var_store(posn_list_2d_size2, "coeff_dy_",
+			     "2d.coeffs/2d.cube.size2/coeff-dy.store.c");
+
+print_name_list_dcl(map(coeff_name, posn_list_2d_size2, "coeff_I_"), "fp",
+		    "2d.coeffs/2d.cube.size2/coeff-I.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_2d_size2, "coeff_dx_"), "fp",
+		    "2d.coeffs/2d.cube.size2/coeff-dx.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_2d_size2, "coeff_dy_"), "fp",
+		    "2d.coeffs/2d.cube.size2/coeff-dy.dcl.c");
 
 print_interp_cmpt__lc_of_data(posn_list_2d_size2,
 			      "result", "coeff_I_", "data_",
@@ -118,23 +129,36 @@ print_interp_cmpt__lc_of_data(posn_list_2d_size2,
 
 data_var_list_2d_size3 := map(data_var_name, posn_list_2d_size3, "data_");
 
-print_name_list_dcl(data_var_list_2d_size3,
-		    "fp", "2d.coeffs/2d.cube.size3/data-var.dcl.c");
-print_data_var_assign(posn_list_2d_size3,
-		      "data_", "2d.coeffs/2d.cube.size3/data-var.assign.c");
-
-print_name_list_dcl(map(coeff_name, posn_list_2d_size3, "coeff_I_"),
-		    "fp", "2d.coeffs/2d.cube.size3/coeff-I.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_2d_size3, "coeff_dx_"),
-		    "fp", "2d.coeffs/2d.cube.size3/coeff-dx.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_2d_size3, "coeff_dy_"),
-		    "fp", "2d.coeffs/2d.cube.size3/coeff-dy.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_2d_size3, "coeff_dxx_"),
-		    "fp", "2d.coeffs/2d.cube.size3/coeff-dxx.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_2d_size3, "coeff_dxy_"),
-		    "fp", "2d.coeffs/2d.cube.size3/coeff-dxy.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_2d_size3, "coeff_dyy_"),
-		    "fp", "2d.coeffs/2d.cube.size3/coeff-dyy.dcl.c");
+print_name_list_dcl(data_var_list_2d_size3, "fp",
+		    "2d.coeffs/2d.cube.size3/data-var.dcl.c");
+print_data_var_assign(posn_list_2d_size3, "data_",
+		      "2d.coeffs/2d.cube.size3/data-var.assign.c");
+
+print_interp_coeff_var_store(posn_list_2d_size3, "coeff_I_",
+			     "2d.coeffs/2d.cube.size3/coeff-I.store.c");
+print_interp_coeff_var_store(posn_list_2d_size3, "coeff_dx_",
+			     "2d.coeffs/2d.cube.size3/coeff-dx.store.c");
+print_interp_coeff_var_store(posn_list_2d_size3, "coeff_dy_",
+			     "2d.coeffs/2d.cube.size3/coeff-dy.store.c");
+print_interp_coeff_var_store(posn_list_2d_size3, "coeff_dxx_",
+			     "2d.coeffs/2d.cube.size3/coeff-dxx.store.c");
+print_interp_coeff_var_store(posn_list_2d_size3, "coeff_dxy_",
+			     "2d.coeffs/2d.cube.size3/coeff-dxy.store.c");
+print_interp_coeff_var_store(posn_list_2d_size3, "coeff_dyy_",
+			     "2d.coeffs/2d.cube.size3/coeff-dyy.store.c");
+
+print_name_list_dcl(map(coeff_name, posn_list_2d_size3, "coeff_I_"), "fp",
+		    "2d.coeffs/2d.cube.size3/coeff-I.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_2d_size3, "coeff_dx_"), "fp",
+		    "2d.coeffs/2d.cube.size3/coeff-dx.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_2d_size3, "coeff_dy_"), "fp",
+		    "2d.coeffs/2d.cube.size3/coeff-dy.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_2d_size3, "coeff_dxx_"), "fp",
+		    "2d.coeffs/2d.cube.size3/coeff-dxx.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_2d_size3, "coeff_dxy_"), "fp",
+		    "2d.coeffs/2d.cube.size3/coeff-dxy.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_2d_size3, "coeff_dyy_"), "fp",
+		    "2d.coeffs/2d.cube.size3/coeff-dyy.dcl.c");
 
 print_interp_cmpt__lc_of_data(posn_list_2d_size3,
 			      "result", "coeff_I_", "data_",
@@ -163,23 +187,36 @@ print_interp_cmpt__lc_of_data(posn_list_2d_size3,
 
 data_var_list_2d_size4 := map(data_var_name, posn_list_2d_size4, "data_");
 
-print_name_list_dcl(data_var_list_2d_size4,
-		    "fp", "2d.coeffs/2d.cube.size4/data-var.dcl.c");
-print_data_var_assign(posn_list_2d_size4,
-		      "data_", "2d.coeffs/2d.cube.size4/data-var.assign.c");
-
-print_name_list_dcl(map(coeff_name, posn_list_2d_size4, "coeff_I_"),
-		    "fp", "2d.coeffs/2d.cube.size4/coeff-I.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_2d_size4, "coeff_dx_"),
-		    "fp", "2d.coeffs/2d.cube.size4/coeff-dx.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_2d_size4, "coeff_dy_"),
-		    "fp", "2d.coeffs/2d.cube.size4/coeff-dy.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_2d_size4, "coeff_dxx_"),
-		    "fp", "2d.coeffs/2d.cube.size4/coeff-dxx.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_2d_size4, "coeff_dxy_"),
-		    "fp", "2d.coeffs/2d.cube.size4/coeff-dxy.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_2d_size4, "coeff_dyy_"),
-		    "fp", "2d.coeffs/2d.cube.size4/coeff-dyy.dcl.c");
+print_name_list_dcl(data_var_list_2d_size4, "fp",
+		    "2d.coeffs/2d.cube.size4/data-var.dcl.c");
+print_data_var_assign(posn_list_2d_size4, "data_",
+		      "2d.coeffs/2d.cube.size4/data-var.assign.c");
+
+print_interp_coeff_var_store(posn_list_2d_size4, "coeff_I_",
+			     "2d.coeffs/2d.cube.size4/coeff-I.store.c");
+print_interp_coeff_var_store(posn_list_2d_size4, "coeff_dx_",
+			     "2d.coeffs/2d.cube.size4/coeff-dx.store.c");
+print_interp_coeff_var_store(posn_list_2d_size4, "coeff_dy_",
+			     "2d.coeffs/2d.cube.size4/coeff-dy.store.c");
+print_interp_coeff_var_store(posn_list_2d_size4, "coeff_dxx_",
+			     "2d.coeffs/2d.cube.size4/coeff-dxx.store.c");
+print_interp_coeff_var_store(posn_list_2d_size4, "coeff_dxy_",
+			     "2d.coeffs/2d.cube.size4/coeff-dxy.store.c");
+print_interp_coeff_var_store(posn_list_2d_size4, "coeff_dyy_",
+			     "2d.coeffs/2d.cube.size4/coeff-dyy.store.c");
+
+print_name_list_dcl(map(coeff_name, posn_list_2d_size4, "coeff_I_"), "fp",
+		    "2d.coeffs/2d.cube.size4/coeff-I.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_2d_size4, "coeff_dx_"), "fp",
+		    "2d.coeffs/2d.cube.size4/coeff-dx.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_2d_size4, "coeff_dy_"), "fp",
+		    "2d.coeffs/2d.cube.size4/coeff-dy.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_2d_size4, "coeff_dxx_"), "fp",
+		    "2d.coeffs/2d.cube.size4/coeff-dxx.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_2d_size4, "coeff_dxy_"), "fp",
+		    "2d.coeffs/2d.cube.size4/coeff-dxy.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_2d_size4, "coeff_dyy_"), "fp",
+		    "2d.coeffs/2d.cube.size4/coeff-dyy.dcl.c");
 
 print_interp_cmpt__lc_of_data(posn_list_2d_size4,
 			      "result", "coeff_I_", "data_",
@@ -208,23 +245,36 @@ print_interp_cmpt__lc_of_data(posn_list_2d_size4,
 
 data_var_list_2d_size5 := map(data_var_name, posn_list_2d_size5, "data_");
 
-print_name_list_dcl(data_var_list_2d_size5,
-		    "fp", "2d.coeffs/2d.cube.size5/data-var.dcl.c");
-print_data_var_assign(posn_list_2d_size5,
-		      "data_", "2d.coeffs/2d.cube.size5/data-var.assign.c");
-
-print_name_list_dcl(map(coeff_name, posn_list_2d_size5, "coeff_I_"),
-		    "fp", "2d.coeffs/2d.cube.size5/coeff-I.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_2d_size5, "coeff_dx_"),
-		    "fp", "2d.coeffs/2d.cube.size5/coeff-dx.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_2d_size5, "coeff_dy_"),
-		    "fp", "2d.coeffs/2d.cube.size5/coeff-dy.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_2d_size5, "coeff_dxx_"),
-		    "fp", "2d.coeffs/2d.cube.size5/coeff-dxx.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_2d_size5, "coeff_dxy_"),
-		    "fp", "2d.coeffs/2d.cube.size5/coeff-dxy.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_2d_size5, "coeff_dyy_"),
-		    "fp", "2d.coeffs/2d.cube.size5/coeff-dyy.dcl.c");
+print_name_list_dcl(data_var_list_2d_size5, "fp",
+		    "2d.coeffs/2d.cube.size5/data-var.dcl.c");
+print_data_var_assign(posn_list_2d_size5, "data_",
+		      "2d.coeffs/2d.cube.size5/data-var.assign.c");
+
+print_interp_coeff_var_store(posn_list_2d_size5, "coeff_I_",
+			     "2d.coeffs/2d.cube.size5/coeff-I.store.c");
+print_interp_coeff_var_store(posn_list_2d_size5, "coeff_dx_",
+			     "2d.coeffs/2d.cube.size5/coeff-dx.store.c");
+print_interp_coeff_var_store(posn_list_2d_size5, "coeff_dy_",
+			     "2d.coeffs/2d.cube.size5/coeff-dy.store.c");
+print_interp_coeff_var_store(posn_list_2d_size5, "coeff_dxx_",
+			     "2d.coeffs/2d.cube.size5/coeff-dxx.store.c");
+print_interp_coeff_var_store(posn_list_2d_size5, "coeff_dxy_",
+			     "2d.coeffs/2d.cube.size5/coeff-dxy.store.c");
+print_interp_coeff_var_store(posn_list_2d_size5, "coeff_dyy_",
+			     "2d.coeffs/2d.cube.size5/coeff-dyy.store.c");
+
+print_name_list_dcl(map(coeff_name, posn_list_2d_size5, "coeff_I_"), "fp",
+		    "2d.coeffs/2d.cube.size5/coeff-I.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_2d_size5, "coeff_dx_"), "fp",
+		    "2d.coeffs/2d.cube.size5/coeff-dx.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_2d_size5, "coeff_dy_"), "fp",
+		    "2d.coeffs/2d.cube.size5/coeff-dy.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_2d_size5, "coeff_dxx_"), "fp",
+		    "2d.coeffs/2d.cube.size5/coeff-dxx.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_2d_size5, "coeff_dxy_"), "fp",
+		    "2d.coeffs/2d.cube.size5/coeff-dxy.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_2d_size5, "coeff_dyy_"), "fp",
+		    "2d.coeffs/2d.cube.size5/coeff-dyy.dcl.c");
 
 print_interp_cmpt__lc_of_data(posn_list_2d_size5,
 			      "result", "coeff_I_", "data_",
@@ -412,4 +462,4 @@ coeff_as_lc_of_data(%, posn_list_2d_size5);
 print_coeff__lc_of_data(%, "coeff_dyy_", "fp",
 			"2d.coeffs/2d.cube.order4.smooth0/coeff-dyy.compute.c");
 
-########################################
+################################################################################
diff --git a/src/GeneralizedPolynomial-Uniform/3d.maple b/src/GeneralizedPolynomial-Uniform/3d.maple
index 03d3a4c..77a3bcd 100644
--- a/src/GeneralizedPolynomial-Uniform/3d.maple
+++ b/src/GeneralizedPolynomial-Uniform/3d.maple
@@ -143,10 +143,14 @@ coeff_list_3d_order4 := [
 coord_list_3d := [x,y,z];
 
 # generate points in Fortran ordering
-posn_list_3d_size2 := map(ListTools[Reverse], hypercube_points([ 0, 0, 0], [+1,+1,+1]));
-posn_list_3d_size3 := map(ListTools[Reverse], hypercube_points([-1,-1,-1], [+1,+1,+1]));
-posn_list_3d_size4 := map(ListTools[Reverse], hypercube_points([-1,-1,-1], [+2,+2,+2]));
-posn_list_3d_size5 := map(ListTools[Reverse], hypercube_points([-2,-2,-2], [+2,+2,+2]));
+posn_list_3d_size2 := map(ListTools[Reverse],
+			  hypercube_points([ 0, 0, 0], [+1,+1,+1]));
+posn_list_3d_size3 := map(ListTools[Reverse],
+			  hypercube_points([-1,-1,-1], [+1,+1,+1]));
+posn_list_3d_size4 := map(ListTools[Reverse],
+			  hypercube_points([-1,-1,-1], [+2,+2,+2]));
+posn_list_3d_size5 := map(ListTools[Reverse],
+			  hypercube_points([-2,-2,-2], [+2,+2,+2]));
 
 ################################################################################
 
@@ -156,19 +160,28 @@ posn_list_3d_size5 := map(ListTools[Reverse], hypercube_points([-2,-2,-2], [+2,+
 
 data_var_list_3d_size2 := map(data_var_name, posn_list_3d_size2, "data_");
 
-print_name_list_dcl(data_var_list_3d_size2,
-		    "fp", "3d.coeffs/3d.cube.size2/data-var.dcl.c");
-print_data_var_assign(posn_list_3d_size2,
-		      "data_", "3d.coeffs/3d.cube.size2/data-var.assign.c");
-
-print_name_list_dcl(map(coeff_name, posn_list_3d_size2, "coeff_I_"),
-		    "fp", "3d.coeffs/3d.cube.size2/coeff-I.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_3d_size2, "coeff_dx_"),
-		    "fp", "3d.coeffs/3d.cube.size2/coeff-dx.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_3d_size2, "coeff_dy_"),
-		    "fp", "3d.coeffs/3d.cube.size2/coeff-dy.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_3d_size2, "coeff_dz_"),
-		    "fp", "3d.coeffs/3d.cube.size2/coeff-dz.dcl.c");
+print_name_list_dcl(data_var_list_3d_size2, "fp",
+		    "3d.coeffs/3d.cube.size2/data-var.dcl.c");
+print_data_var_assign(posn_list_3d_size2, "data_",
+		      "3d.coeffs/3d.cube.size2/data-var.assign.c");
+
+print_interp_coeff_var_store(posn_list_3d_size2, "coeff_I_",
+			     "3d.coeffs/3d.cube.size2/coeff-I.store.c");
+print_interp_coeff_var_store(posn_list_3d_size2, "coeff_dx_",
+			     "3d.coeffs/3d.cube.size2/coeff-dx.store.c");
+print_interp_coeff_var_store(posn_list_3d_size2, "coeff_dy_",
+			     "3d.coeffs/3d.cube.size2/coeff-dy.store.c");
+print_interp_coeff_var_store(posn_list_3d_size2, "coeff_dz_",
+			     "3d.coeffs/3d.cube.size2/coeff-dz.store.c");
+
+print_name_list_dcl(map(coeff_name, posn_list_3d_size2, "coeff_I_"), "fp",
+		    "3d.coeffs/3d.cube.size2/coeff-I.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_3d_size2, "coeff_dx_"), "fp",
+		    "3d.coeffs/3d.cube.size2/coeff-dx.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_3d_size2, "coeff_dy_"), "fp",
+		    "3d.coeffs/3d.cube.size2/coeff-dy.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_3d_size2, "coeff_dz_"), "fp",
+		    "3d.coeffs/3d.cube.size2/coeff-dz.dcl.c");
 
 print_interp_cmpt__lc_of_data(posn_list_3d_size2,
 			      "result", "coeff_I_", "data_",
@@ -191,31 +204,52 @@ print_interp_cmpt__lc_of_data(posn_list_3d_size2,
 
 data_var_list_3d_size3 := map(data_var_name, posn_list_3d_size3, "data_");
 
-print_name_list_dcl(data_var_list_3d_size3,
-		    "fp", "3d.coeffs/3d.cube.size3/data-var.dcl.c");
-print_data_var_assign(posn_list_3d_size3,
-		      "data_", "3d.coeffs/3d.cube.size3/data-var.assign.c");
-
-print_name_list_dcl(map(coeff_name, posn_list_3d_size3, "coeff_I_"),
-		    "fp", "3d.coeffs/3d.cube.size3/coeff-I.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_3d_size3, "coeff_dx_"),
-		    "fp", "3d.coeffs/3d.cube.size3/coeff-dx.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_3d_size3, "coeff_dy_"),
-		    "fp", "3d.coeffs/3d.cube.size3/coeff-dy.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_3d_size3, "coeff_dz_"),
-		    "fp", "3d.coeffs/3d.cube.size3/coeff-dz.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_3d_size3, "coeff_dxx_"),
-		    "fp", "3d.coeffs/3d.cube.size3/coeff-dxx.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_3d_size3, "coeff_dxy_"),
-		    "fp", "3d.coeffs/3d.cube.size3/coeff-dxy.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_3d_size3, "coeff_dxz_"),
-		    "fp", "3d.coeffs/3d.cube.size3/coeff-dxz.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_3d_size3, "coeff_dyy_"),
-		    "fp", "3d.coeffs/3d.cube.size3/coeff-dyy.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_3d_size3, "coeff_dyz_"),
-		    "fp", "3d.coeffs/3d.cube.size3/coeff-dyz.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_3d_size3, "coeff_dzz_"),
-		    "fp", "3d.coeffs/3d.cube.size3/coeff-dzz.dcl.c");
+print_name_list_dcl(data_var_list_3d_size3, "fp",
+		    "3d.coeffs/3d.cube.size3/data-var.dcl.c");
+print_data_var_assign(posn_list_3d_size3, "data_",
+		      "3d.coeffs/3d.cube.size3/data-var.assign.c");
+
+print_interp_coeff_var_store(posn_list_3d_size3, "coeff_I_",
+			     "3d.coeffs/3d.cube.size3/coeff-I.store.c");
+print_interp_coeff_var_store(posn_list_3d_size3, "coeff_dx_",
+			     "3d.coeffs/3d.cube.size3/coeff-dx.store.c");
+print_interp_coeff_var_store(posn_list_3d_size3, "coeff_dy_",
+			     "3d.coeffs/3d.cube.size3/coeff-dy.store.c");
+print_interp_coeff_var_store(posn_list_3d_size3, "coeff_dz_",
+			     "3d.coeffs/3d.cube.size3/coeff-dz.store.c");
+print_interp_coeff_var_store(posn_list_3d_size3, "coeff_dxx_",
+			     "3d.coeffs/3d.cube.size3/coeff-dxx.store.c");
+print_interp_coeff_var_store(posn_list_3d_size3, "coeff_dxy_",
+			     "3d.coeffs/3d.cube.size3/coeff-dxy.store.c");
+print_interp_coeff_var_store(posn_list_3d_size3, "coeff_dxz_",
+			     "3d.coeffs/3d.cube.size3/coeff-dxz.store.c");
+print_interp_coeff_var_store(posn_list_3d_size3, "coeff_dyy_",
+			     "3d.coeffs/3d.cube.size3/coeff-dyy.store.c");
+print_interp_coeff_var_store(posn_list_3d_size3, "coeff_dyz_",
+			     "3d.coeffs/3d.cube.size3/coeff-dyz.store.c");
+print_interp_coeff_var_store(posn_list_3d_size3, "coeff_dzz_",
+			     "3d.coeffs/3d.cube.size3/coeff-dzz.store.c");
+
+print_name_list_dcl(map(coeff_name, posn_list_3d_size3, "coeff_I_"), "fp",
+		    "3d.coeffs/3d.cube.size3/coeff-I.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_3d_size3, "coeff_dx_"), "fp",
+		    "3d.coeffs/3d.cube.size3/coeff-dx.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_3d_size3, "coeff_dy_"), "fp",
+		    "3d.coeffs/3d.cube.size3/coeff-dy.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_3d_size3, "coeff_dz_"), "fp",
+		    "3d.coeffs/3d.cube.size3/coeff-dz.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_3d_size3, "coeff_dxx_"), "fp",
+		    "3d.coeffs/3d.cube.size3/coeff-dxx.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_3d_size3, "coeff_dxy_"), "fp",
+		    "3d.coeffs/3d.cube.size3/coeff-dxy.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_3d_size3, "coeff_dxz_"), "fp",
+		    "3d.coeffs/3d.cube.size3/coeff-dxz.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_3d_size3, "coeff_dyy_"), "fp",
+		    "3d.coeffs/3d.cube.size3/coeff-dyy.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_3d_size3, "coeff_dyz_"), "fp",
+		    "3d.coeffs/3d.cube.size3/coeff-dyz.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_3d_size3, "coeff_dzz_"), "fp",
+		    "3d.coeffs/3d.cube.size3/coeff-dzz.dcl.c");
 
 print_interp_cmpt__lc_of_data(posn_list_3d_size3,
 			      "result", "coeff_I_", "data_",
@@ -256,31 +290,52 @@ print_interp_cmpt__lc_of_data(posn_list_3d_size3,
 
 data_var_list_3d_size4 := map(data_var_name, posn_list_3d_size4, "data_");
 
-print_name_list_dcl(data_var_list_3d_size4,
-		    "fp", "3d.coeffs/3d.cube.size4/data-var.dcl.c");
-print_data_var_assign(posn_list_3d_size4,
-		      "data_", "3d.coeffs/3d.cube.size4/data-var.assign.c");
-
-print_name_list_dcl(map(coeff_name, posn_list_3d_size4, "coeff_I_"),
-		    "fp", "3d.coeffs/3d.cube.size4/coeff-I.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_3d_size4, "coeff_dx_"),
-		    "fp", "3d.coeffs/3d.cube.size4/coeff-dx.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_3d_size4, "coeff_dy_"),
-		    "fp", "3d.coeffs/3d.cube.size4/coeff-dy.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_3d_size4, "coeff_dz_"),
-		    "fp", "3d.coeffs/3d.cube.size4/coeff-dz.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_3d_size4, "coeff_dxx_"),
-		    "fp", "3d.coeffs/3d.cube.size4/coeff-dxx.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_3d_size4, "coeff_dxy_"),
-		    "fp", "3d.coeffs/3d.cube.size4/coeff-dxy.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_3d_size4, "coeff_dxz_"),
-		    "fp", "3d.coeffs/3d.cube.size4/coeff-dxz.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_3d_size4, "coeff_dyy_"),
-		    "fp", "3d.coeffs/3d.cube.size4/coeff-dyy.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_3d_size4, "coeff_dyz_"),
-		    "fp", "3d.coeffs/3d.cube.size4/coeff-dyz.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_3d_size4, "coeff_dzz_"),
-		    "fp", "3d.coeffs/3d.cube.size4/coeff-dzz.dcl.c");
+print_name_list_dcl(data_var_list_3d_size4, "fp",
+		    "3d.coeffs/3d.cube.size4/data-var.dcl.c");
+print_data_var_assign(posn_list_3d_size4, "data_",
+		      "3d.coeffs/3d.cube.size4/data-var.assign.c");
+
+print_interp_coeff_var_store(posn_list_3d_size4, "coeff_I_",
+			     "3d.coeffs/3d.cube.size4/coeff-I.store.c");
+print_interp_coeff_var_store(posn_list_3d_size4, "coeff_dx_",
+			     "3d.coeffs/3d.cube.size4/coeff-dx.store.c");
+print_interp_coeff_var_store(posn_list_3d_size4, "coeff_dy_",
+			     "3d.coeffs/3d.cube.size4/coeff-dy.store.c");
+print_interp_coeff_var_store(posn_list_3d_size4, "coeff_dz_",
+			     "3d.coeffs/3d.cube.size4/coeff-dz.store.c");
+print_interp_coeff_var_store(posn_list_3d_size4, "coeff_dxx_",
+			     "3d.coeffs/3d.cube.size4/coeff-dxx.store.c");
+print_interp_coeff_var_store(posn_list_3d_size4, "coeff_dxy_",
+			     "3d.coeffs/3d.cube.size4/coeff-dxy.store.c");
+print_interp_coeff_var_store(posn_list_3d_size4, "coeff_dxz_",
+			     "3d.coeffs/3d.cube.size4/coeff-dxz.store.c");
+print_interp_coeff_var_store(posn_list_3d_size4, "coeff_dyy_",
+			     "3d.coeffs/3d.cube.size4/coeff-dyy.store.c");
+print_interp_coeff_var_store(posn_list_3d_size4, "coeff_dyz_",
+			     "3d.coeffs/3d.cube.size4/coeff-dyz.store.c");
+print_interp_coeff_var_store(posn_list_3d_size4, "coeff_dzz_",
+			     "3d.coeffs/3d.cube.size4/coeff-dzz.store.c");
+
+print_name_list_dcl(map(coeff_name, posn_list_3d_size4, "coeff_I_"), "fp",
+		    "3d.coeffs/3d.cube.size4/coeff-I.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_3d_size4, "coeff_dx_"), "fp",
+		    "3d.coeffs/3d.cube.size4/coeff-dx.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_3d_size4, "coeff_dy_"), "fp",
+		    "3d.coeffs/3d.cube.size4/coeff-dy.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_3d_size4, "coeff_dz_"), "fp",
+		    "3d.coeffs/3d.cube.size4/coeff-dz.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_3d_size4, "coeff_dxx_"), "fp",
+		    "3d.coeffs/3d.cube.size4/coeff-dxx.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_3d_size4, "coeff_dxy_"), "fp",
+		    "3d.coeffs/3d.cube.size4/coeff-dxy.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_3d_size4, "coeff_dxz_"), "fp",
+		    "3d.coeffs/3d.cube.size4/coeff-dxz.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_3d_size4, "coeff_dyy_"), "fp",
+		    "3d.coeffs/3d.cube.size4/coeff-dyy.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_3d_size4, "coeff_dyz_"), "fp",
+		    "3d.coeffs/3d.cube.size4/coeff-dyz.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_3d_size4, "coeff_dzz_"), "fp",
+		    "3d.coeffs/3d.cube.size4/coeff-dzz.dcl.c");
 
 print_interp_cmpt__lc_of_data(posn_list_3d_size4,
 			      "result", "coeff_I_", "data_",
@@ -321,31 +376,52 @@ print_interp_cmpt__lc_of_data(posn_list_3d_size4,
 
 data_var_list_3d_size5 := map(data_var_name, posn_list_3d_size5, "data_");
 
-print_name_list_dcl(data_var_list_3d_size5,
-		    "fp", "3d.coeffs/3d.cube.size5/data-var.dcl.c");
-print_data_var_assign(posn_list_3d_size5,
-		      "data_", "3d.coeffs/3d.cube.size5/data-var.assign.c");
-
-print_name_list_dcl(map(coeff_name, posn_list_3d_size5, "coeff_I_"),
-		    "fp", "3d.coeffs/3d.cube.size5/coeff-I.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_3d_size5, "coeff_dx_"),
-		    "fp", "3d.coeffs/3d.cube.size5/coeff-dx.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_3d_size5, "coeff_dy_"),
-		    "fp", "3d.coeffs/3d.cube.size5/coeff-dy.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_3d_size5, "coeff_dz_"),
-		    "fp", "3d.coeffs/3d.cube.size5/coeff-dz.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_3d_size5, "coeff_dxx_"),
-		    "fp", "3d.coeffs/3d.cube.size5/coeff-dxx.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_3d_size5, "coeff_dxy_"),
-		    "fp", "3d.coeffs/3d.cube.size5/coeff-dxy.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_3d_size5, "coeff_dxz_"),
-		    "fp", "3d.coeffs/3d.cube.size5/coeff-dxz.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_3d_size5, "coeff_dyy_"),
-		    "fp", "3d.coeffs/3d.cube.size5/coeff-dyy.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_3d_size5, "coeff_dyz_"),
-		    "fp", "3d.coeffs/3d.cube.size5/coeff-dyz.dcl.c");
-print_name_list_dcl(map(coeff_name, posn_list_3d_size5, "coeff_dzz_"),
-		    "fp", "3d.coeffs/3d.cube.size5/coeff-dzz.dcl.c");
+print_name_list_dcl(data_var_list_3d_size5, "fp",
+		    "3d.coeffs/3d.cube.size5/data-var.dcl.c");
+print_data_var_assign(posn_list_3d_size5, "data_",
+		      "3d.coeffs/3d.cube.size5/data-var.assign.c");
+
+print_interp_coeff_var_store(posn_list_3d_size5, "coeff_I_",
+			     "3d.coeffs/3d.cube.size5/coeff-I.store.c");
+print_interp_coeff_var_store(posn_list_3d_size5, "coeff_dx_",
+			     "3d.coeffs/3d.cube.size5/coeff-dx.store.c");
+print_interp_coeff_var_store(posn_list_3d_size5, "coeff_dy_",
+			     "3d.coeffs/3d.cube.size5/coeff-dy.store.c");
+print_interp_coeff_var_store(posn_list_3d_size5, "coeff_dz_",
+			     "3d.coeffs/3d.cube.size5/coeff-dz.store.c");
+print_interp_coeff_var_store(posn_list_3d_size5, "coeff_dxx_",
+			     "3d.coeffs/3d.cube.size5/coeff-dxx.store.c");
+print_interp_coeff_var_store(posn_list_3d_size5, "coeff_dxy_",
+			     "3d.coeffs/3d.cube.size5/coeff-dxy.store.c");
+print_interp_coeff_var_store(posn_list_3d_size5, "coeff_dxz_",
+			     "3d.coeffs/3d.cube.size5/coeff-dxz.store.c");
+print_interp_coeff_var_store(posn_list_3d_size5, "coeff_dyy_",
+			     "3d.coeffs/3d.cube.size5/coeff-dyy.store.c");
+print_interp_coeff_var_store(posn_list_3d_size5, "coeff_dyz_",
+			     "3d.coeffs/3d.cube.size5/coeff-dyz.store.c");
+print_interp_coeff_var_store(posn_list_3d_size5, "coeff_dzz_",
+			     "3d.coeffs/3d.cube.size5/coeff-dzz.store.c");
+
+print_name_list_dcl(map(coeff_name, posn_list_3d_size5, "coeff_I_"), "fp",
+		    "3d.coeffs/3d.cube.size5/coeff-I.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_3d_size5, "coeff_dx_"), "fp",
+		    "3d.coeffs/3d.cube.size5/coeff-dx.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_3d_size5, "coeff_dy_"), "fp",
+		    "3d.coeffs/3d.cube.size5/coeff-dy.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_3d_size5, "coeff_dz_"), "fp",
+		    "3d.coeffs/3d.cube.size5/coeff-dz.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_3d_size5, "coeff_dxx_"), "fp",
+		    "3d.coeffs/3d.cube.size5/coeff-dxx.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_3d_size5, "coeff_dxy_"), "fp",
+		    "3d.coeffs/3d.cube.size5/coeff-dxy.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_3d_size5, "coeff_dxz_"), "fp",
+		    "3d.coeffs/3d.cube.size5/coeff-dxz.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_3d_size5, "coeff_dyy_"), "fp",
+		    "3d.coeffs/3d.cube.size5/coeff-dyy.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_3d_size5, "coeff_dyz_"), "fp",
+		    "3d.coeffs/3d.cube.size5/coeff-dyz.dcl.c");
+print_name_list_dcl(map(coeff_name, posn_list_3d_size5, "coeff_dzz_"), "fp",
+		    "3d.coeffs/3d.cube.size5/coeff-dzz.dcl.c");
 
 print_interp_cmpt__lc_of_data(posn_list_3d_size5,
 			      "result", "coeff_I_", "data_",
diff --git a/src/GeneralizedPolynomial-Uniform/interpolate.maple b/src/GeneralizedPolynomial-Uniform/interpolate.maple
index 51ecf0a..7f401af 100644
--- a/src/GeneralizedPolynomial-Uniform/interpolate.maple
+++ b/src/GeneralizedPolynomial-Uniform/interpolate.maple
@@ -8,6 +8,7 @@
 #
 # print_coeff__lc_of_data - print C code to compute coefficients
 # print_data_var_assign - print C code to assign data-value variables
+# print_interp_coeff_var_store - print C code to store coeff vars "somewhere"
 # print_interp_cmpt__lc_of_data - print C code for computation of interpolant
 #
 # coeff_name - name of coefficient of data at a given [m] coordinate
@@ -186,6 +187,8 @@ fi;
 # now print the optimized computation sequence
 codegen[C](cmpt_list, filename=file_name);
 
+fclose(file_name);
+
 NULL;
 end proc;
 
@@ -193,7 +196,8 @@ end proc;
 
 #
 # This function prints a sequence of C expression to assign the data-value
-# variables.
+# variables, eg
+#	data_m1_p1 = DATA(-1,1);
 #
 # Arguments:
 # posn_list = The same list of positions as was used to compute the
@@ -210,7 +214,6 @@ proc(
     )
 
 ftruncate(file_name);
-
 map(
        proc(posn::list(numeric))
        fprintf(file_name,
@@ -221,6 +224,44 @@ map(
      ,
        posn_list
    );
+fclose(file_name);
+
+NULL;
+end proc;
+
+################################################################################
+
+#
+# This function prints a sequence of C expression to assign the interpolation
+# coefficients to  COEFF(...)  expressions, eg
+#	COEFF(1,-1) = coeff_dx_p1_m1
+#
+# Arguments:
+# posn_list = The same list of positions as was used to compute the
+#	      interpolating polynomial.
+# coeff_name_prefix = A prefix string for the coefficient names.
+# file_name = The file name to write the coefficients to.  This is
+#	      truncated before writing.
+#
+print_interp_coeff_var_store :=
+proc(
+      posn_list::list(list(numeric)),
+      coeff_name_prefix::string,
+      file_name::string
+    )
+
+ftruncate(file_name);
+map(
+       proc(posn::list(numeric))
+       fprintf(file_name,
+	       "%a = %s;\n",
+	       'COEFF'(op(posn)),
+	       coeff_name(posn,coeff_name_prefix));
+       end proc
+     ,
+       posn_list
+   );
+fclose(file_name);
 
 NULL;
 end proc;
@@ -253,6 +294,7 @@ proc(
     )
 
 ftruncate(file_name);
+
 fprintf(file_name, "%s =\n", result_var_name);
 
 # list of "coeff*data_var" terms
@@ -268,8 +310,10 @@ map(
 
 ListTools[Join](%, "\n\t+ ");
 cat(op(%));
-
 fprintf(file_name, "\t%s;\n", %);
+
+fclose(file_name);
+
 NULL;
 end proc;
 
diff --git a/src/GeneralizedPolynomial-Uniform/util.maple b/src/GeneralizedPolynomial-Uniform/util.maple
index 4598c0c..cd1a4a1 100644
--- a/src/GeneralizedPolynomial-Uniform/util.maple
+++ b/src/GeneralizedPolynomial-Uniform/util.maple
@@ -296,6 +296,8 @@ cat(op(%));
 fprintf(file_name,
 	"%s %s;\n",
 	name_type, %);
+
+fclose(file_name);
 NULL;
 end proc;