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

Merge branch 'master' into iss2345

Browse Source
This commit is contained in:
Axel Kohlmeyer
2020-09-15 14:06:16 -04:00
parent 5cbb54b844 b5832191d8
commit 326d9f398c
375 changed files with 11098 additions and 10093 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/read_data.cpp
View File

@ -294,8 +294,11 @@ void ReadData::command(int narg, char **arg)
// error checks
if (domain->dimension == 2 && domain->zperiodic == 0)
if ((domain->dimension == 2) && (domain->zperiodic == 0))
error->all(FLERR,"Cannot run 2d simulation with nonperiodic Z dimension");
if ((domain->nonperiodic == 2) && utils::strmatch(force->kspace_style,"^msm"))
error->all(FLERR,"Reading a data file with shrinkwrap boundaries is "
"not compatible with a MSM KSpace style");
if (domain->box_exist && !addflag)
error->all(FLERR,"Cannot read_data without add keyword "
"after simulation box is defined");