kokkos: waxpby argument order for decomposed case

In ref/ cg_solve.hpp, we have waxpby(one, r, beta, p, p)

In kokkos/ we had waxpby(beta, p, one, r, p)

These are algebraicly equivalent:

waxpby(alpha, x, beta, y, w) computes w = alpha*x + beta*y,

so ref/: p = 1*r + beta * p
kokkos/: p = beta*p + 1*r

However, p is length A.num_cols and includes ghost entries after
make_local_matrix, while r has only local rows. For mpi runs, when p is
the x argument it trips

y.local_size < x.local_size || w.local_size < x.local_size

This PR swaps the Kokkos arguments back to the ref ones, so
when p is extra long the check doesn't trip.

Signed-off-by: Carl Pearson <cwpears@sandia.gov>

Author: cwpearson

kokkos/src/cg_solve.hpp

@@ -159,7 +159,7 @@ cg_solve(OperatorType& A,
       oldrtrans = rtrans;
       TICK(); rtrans = dot(r, r); TOCK(tDOT);
       magnitude_type beta = rtrans/oldrtrans;
-      TICK(); waxpby(beta, p, one, r, p); TOCK(tWAXPY);
+      TICK(); waxpby(one, r, beta, p, p); TOCK(tWAXPY);
     }
     normr = std::sqrt(rtrans);
     if (myproc == 0 && (k%print_freq==0 || k==max_iter)) {
@@ -219,4 +219,3 @@ cg_solve(OperatorType& A,
 }//namespace miniFE
 
 #endif
-