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

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11482 f3b2605a-c512-4ea7-a41b-209d697bcdaa

This commit is contained in:
sjplimp 2014-02-05 19:38:49 +00:00
parent cd5b3841ab
commit e78efeee6a
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/Makefile
View File

@ -147,21 +147,21 @@ package:
@echo '' @echo ''
@echo 'User-contributed packages:' $(PACKUSER) @echo 'User-contributed packages:' $(PACKUSER)
@echo '' @echo ''
@echo 'make package list available packages' @echo 'make package list available packages'
@echo 'make package-status (ps) status of all packages' @echo 'make package-status (ps) status of all packages'
@echo 'make yes-package install a single package in src dir' @echo 'make yes-package install a single package in src dir'
@echo 'make no-package remove a single package from src dir' @echo 'make no-package remove a single package from src dir'
@echo 'make yes-all install all packages in src dir' @echo 'make yes-all install all packages in src dir'
@echo 'make no-all remove all packages from src dir' @echo 'make no-all remove all packages from src dir'
@echo 'make yes-standard install all standard packages' @echo 'make yes-standard install all standard packages'
@echo 'make no-standard remove all standard packages' @echo 'make no-standard remove all standard packages'
@echo 'make yes-user install all user packages' @echo 'make yes-user install all user packages'
@echo 'make no-user remove all user packages' @echo 'make no-user remove all user packages'
@echo 'make no-lib remove all packages with external libs' @echo 'make no-lib remove all packages with external libs'
@echo '' @echo ''
@echo 'make package-update (pu) replace src files with package files' @echo 'make package-update (pu) replace src files with package files'
@echo 'make package-overwrite (po) replace package files with src files' @echo 'make package-overwrite replace package files with src files'
@echo 'make package-diff diff src files against package file' @echo 'make package-diff (pd) diff src files against package file'
yes-all: yes-all:
@for p in $(PACKALL); do $(MAKE) yes-$$p; done @for p in $(PACKALL); do $(MAKE) yes-$$p; done
@ -229,12 +229,12 @@ package-update pu:
@echo '' @echo ''
@for p in $(PACKUSERUC); do $(SHELL) Package.sh $$p update; done @for p in $(PACKUSERUC); do $(SHELL) Package.sh $$p update; done
package-overwrite po: package-overwrite:
@for p in $(PACKAGEUC); do $(SHELL) Package.sh $$p overwrite; done @for p in $(PACKAGEUC); do $(SHELL) Package.sh $$p overwrite; done
@echo '' @echo ''
@for p in $(PACKUSERUC); do $(SHELL) Package.sh $$p overwrite; done @for p in $(PACKUSERUC); do $(SHELL) Package.sh $$p overwrite; done
package-diff: package-diff pd:
@for p in $(PACKAGEUC); do $(SHELL) Package.sh $$p diff; done @for p in $(PACKAGEUC); do $(SHELL) Package.sh $$p diff; done
@echo '' @echo ''
@for p in $(PACKUSERUC); do $(SHELL) Package.sh $$p diff; done @for p in $(PACKUSERUC); do $(SHELL) Package.sh $$p diff; done

7
src/group.cpp
View File

@ -439,8 +439,13 @@ void Group::assign(int narg, char **arg)
} else if (strcmp(arg[1],"dynamic") == 0) { } else if (strcmp(arg[1],"dynamic") == 0) {
if (narg < 4) error->all(FLERR,"Illegal group command"); if (narg < 4) error->all(FLERR,"Illegal group command");
if (strcmp(arg[0],arg[2]) == 0)
error->all(FLERR,"Group dynamic cannot reference itself");
if (find(arg[2]) < 0)
error->all(FLERR,"Group dynamic parent group does not exist");
if (igroup = 0) error->all(FLERR,"Group all cannot be made dynamic");
// if group is already dynamic, delete current FixGroup // if group is already dynamic, delete existing FixGroup
if (dynamic[igroup]) { if (dynamic[igroup]) {
int n = strlen("GROUP_") + strlen(names[igroup]) + 1; int n = strlen("GROUP_") + strlen(names[igroup]) + 1;