diff --git a/doc/src/Commands_pair.rst b/doc/src/Commands_pair.rst index 3f5deef24a..c6d54f0683 100644 --- a/doc/src/Commands_pair.rst +++ b/doc/src/Commands_pair.rst @@ -93,8 +93,8 @@ OPT. * :doc:`coul/wolf/cs ` * :doc:`dpd (giko) ` * :doc:`dpd/fdt ` - * :doc:`dpd/ext (k) ` - * :doc:`dpd/ext/tstat (k) ` + * :doc:`dpd/ext (ko) ` + * :doc:`dpd/ext/tstat (ko) ` * :doc:`dpd/fdt/energy (k) ` * :doc:`dpd/tstat (gko) ` * :doc:`dsmc ` diff --git a/doc/src/pair_dpd_ext.rst b/doc/src/pair_dpd_ext.rst index 54d1e4bca3..ff782e4b33 100644 --- a/doc/src/pair_dpd_ext.rst +++ b/doc/src/pair_dpd_ext.rst @@ -1,17 +1,19 @@ .. index:: pair_style dpd/ext .. index:: pair_style dpd/ext/kk +.. index:: pair_style dpd/ext/omp .. index:: pair_style dpd/ext/tstat .. index:: pair_style dpd/ext/tstat/kk +.. index:: pair_style dpd/ext/tstat/omp pair_style dpd/ext command ========================== -Accelerator Variants: dpd/ext/kk +Accelerator Variants: dpd/ext/kk dpd/ext/omp pair_style dpd/ext/tstat command ================================ -Accelerator Variants: dpd/ext/tstat/kk +Accelerator Variants: dpd/ext/tstat/kk dpd/ext/tstat/omp Syntax """""" diff --git a/src/OPENMP/pair_dpd_ext_omp.cpp b/src/OPENMP/pair_dpd_ext_omp.cpp index dda677154d..e84c1360da 100644 --- a/src/OPENMP/pair_dpd_ext_omp.cpp +++ b/src/OPENMP/pair_dpd_ext_omp.cpp @@ -190,7 +190,7 @@ void PairDPDExtOMP::eval(int iifrom, int iito, ThrData * const thr) P[2][0] = P[0][2]; P[2][1] = P[1][2]; P[2][2] = 1.0 - delz*delz*rinv*rinv; - + wd = 1.0 - r/cut[itype][jtype]; wdPar = pow(wd,ws[itype][jtype]); wdPerp = pow(wd,wsT[itype][jtype]); diff --git a/src/OPENMP/pair_dpd_ext_tstat_omp.cpp b/src/OPENMP/pair_dpd_ext_tstat_omp.cpp index d1bd134645..fa4c80abaa 100644 --- a/src/OPENMP/pair_dpd_ext_tstat_omp.cpp +++ b/src/OPENMP/pair_dpd_ext_tstat_omp.cpp @@ -203,7 +203,7 @@ void PairDPDExtTstatOMP::eval(int iifrom, int iito, ThrData * const thr) P[2][0] = P[0][2]; P[2][1] = P[1][2]; P[2][2] = 1.0 - delz*delz*rinv*rinv; - + wd = 1.0 - r/cut[itype][jtype]; wdPar = pow(wd,ws[itype][jtype]); wdPerp = pow(wd,wsT[itype][jtype]);