Synch multigrid rewrite to repository and

broad unicode elimination effort

examples/Makefile.am

@@ -2,13 +2,15 @@ SUBDIRS = .
 
 include Make.inc
 
-# Precision variants of the two multigrid drivers.  The coarse-sector and
+# Compile-time variants of the two multigrid drivers.  The coarse-sector and
 # dense-inversion precisions are compile-time instantiations, so each is its
 # own binary built from the same source; the fine-level precision is a
-# run-time parameter and needs no variant.  Per-target flags give each
-# variant its own object file.
+# run-time parameter and needs no variant.  The recur variant additionally
+# takes the GCR residual norm from the recurrence rather than a reduction.
+# Per-target flags give each variant its own object file.
 bin_PROGRAMS += Example_pvdagm_multigrid_fp32coarse \
                 Example_pvdagm_multigrid_fp32coarse_fp32dense \
+                Example_pvdagm_multigrid_fp32coarse_fp32dense_recur \
                 Example_hdcg_multigrid_fp32coarse
 
 Example_pvdagm_multigrid_fp32coarse_SOURCES  = Example_pvdagm_multigrid.cc
@@ -19,6 +21,10 @@ Example_pvdagm_multigrid_fp32coarse_fp32dense_SOURCES  = Example_pvdagm_multigri
 Example_pvdagm_multigrid_fp32coarse_fp32dense_CPPFLAGS = -DCOARSE_SINGLE -DGRID_DENSE_INVERSE_SINGLE
 Example_pvdagm_multigrid_fp32coarse_fp32dense_LDADD    = $(top_builddir)/Grid/libGrid.a
 
+Example_pvdagm_multigrid_fp32coarse_fp32dense_recur_SOURCES  = Example_pvdagm_multigrid.cc
+Example_pvdagm_multigrid_fp32coarse_fp32dense_recur_CPPFLAGS = -DCOARSE_SINGLE -DGRID_DENSE_INVERSE_SINGLE -DGRID_GCR_RESIDUAL_RECURRENCE
+Example_pvdagm_multigrid_fp32coarse_fp32dense_recur_LDADD    = $(top_builddir)/Grid/libGrid.a
+
 Example_hdcg_multigrid_fp32coarse_SOURCES  = Example_hdcg_multigrid.cc
 Example_hdcg_multigrid_fp32coarse_CPPFLAGS = -DCOARSE_SINGLE
 Example_hdcg_multigrid_fp32coarse_LDADD    = $(top_builddir)/Grid/libGrid.a