jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #894 from akohlmey/cplusplus-clang-fixes 

More fixes to conform with C++ standards as indicated by Clang
This commit is contained in:
Steve Plimpton 2018-05-07 14:53:43 -06:00 committed by GitHub
parent a4759210a8 82217001c8
commit bfdfd36c1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/USER-INTEL/intel_buffers.cpp
View File

@ -642,6 +642,6 @@ double IntelBuffers<flt_t, acc_t>::memory_usage(const int nthreads)
/* ---------------------------------------------------------------------- */
template class IntelBuffers<float,float>;
template class IntelBuffers<float,double>;
template class IntelBuffers<double,double>;
template class LAMMPS_NS::IntelBuffers<float,float>;
template class LAMMPS_NS::IntelBuffers<float,double>;
template class LAMMPS_NS::IntelBuffers<double,double>;

2
src/USER-MESO/fix_edpd_source.cpp
View File

@ -112,7 +112,7 @@ void FixEDPDSource::post_force(int vflag)
drx = x[i][0] - center[0];
dry = x[i][1] - center[1];
drz = x[i][2] - center[2];
if(abs(drx) <= 0.5*dLx && abs(dry) <= 0.5*dLy && abs(drz) <= 0.5*dLz)
if(fabs(drx) <= 0.5*dLx && fabs(dry) <= 0.5*dLy && fabs(drz) <= 0.5*dLz)
edpd_flux[i] += value*edpd_cv[i];
}
}

2
src/USER-MESO/fix_tdpd_source.cpp
View File

@ -112,7 +112,7 @@ void FixTDPDSource::post_force(int vflag)
drx = x[i][0] - center[0];
dry = x[i][1] - center[1];
drz = x[i][2] - center[2];
if(abs(drx) <= 0.5*dLx && abs(dry) <= 0.5*dLy && abs(drz) <= 0.5*dLz)
if(fabs(drx) <= 0.5*dLx && fabs(dry) <= 0.5*dLy && fabs(drz) <= 0.5*dLz)
cc_flux[i][cc_index-1] += value;
}
}