Merge branch 'USER-DPD_kokkos' into USER-DPD_GBhacks, bring in bugfix

2017-03-19 21:22:59 -04:00
parent b3c46b7269 a68f3a93e5
commit 20de98e898
1 changed files with 1 additions and 0 deletions
--- a/src/KOKKOS/pair_exp6_rx_kokkos.cpp
+++ b/src/KOKKOS/pair_exp6_rx_kokkos.cpp
@ -917,6 +917,7 @@ void PairExp6rxKokkos<DeviceType>::getMixingWeights(int id,double &epsilon1,doub
      nMoleculesOld2 = dvector(ispecies+nspecies,id);
      nMolecules2 = dvector(ispecies,id);
      fractionOld2 = dvector(ispecies+nspecies,id)/nTotalold;
+      fraction2 = nMolecules2/nTotal;
    }

    // If Site1 or Site2 matches is a fluid, then compute the paramters