ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removing merge conflict

Browse Source
This commit is contained in:
jtclemm
2023-03-24 22:02:30 -06:00
parent 29edfc45d7 b46b786a3f
commit d98435f435
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/RHEO/pair_rheo.cpp
View File

@ -218,12 +218,12 @@ void PairRHEO::compute(int eflag, int vflag)
// Thermal Evolution
if (thermal_flag) {
dT = dot3(dx, dWij);
dT *= (kappai + kappaj) * (Ti - Tj) * rinv * rinv * voli * volj;
dT *= (kappai + kappaj) * (Ti - Tj) * rinv * rinv * voli * volj / rho0;
heatflow[i] += dT;
if (newton_pair || j < nlocal) {
dT = dot3(dx, dWji);
dT *= (kappai + kappaj) * (Tj - Ti) * rinv * rinv * voli * volj;
dT *= (kappai + kappaj) * (Tj - Ti) * rinv * rinv * voli * volj / rho0;
heatflow[j] -= dT;
}
}