suzerain: i indices -> k

git-svn-id: https://svn.ices.utexas.edu/repos/pecos/suzerain/trunk@43999 0bd85f0b-c151-43b9-a1e9-27231104551f
suzerain: use enum i, j to reduce magic numbers

Reduces likelihood for copy'n'paste mistakes in the future.

git-svn-id: https://svn.ices.utexas.edu/repos/pecos/suzerain/trunk@44000 0bd85f0b-c151-43b9-a1e9-27231104551f