projects
/
physik
/
posic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
optional elment and brand type in fill cmd now
[physik/posic.git]
/
mdrun.c
diff --git
a/mdrun.c
b/mdrun.c
index
dd8679e
..
17ce277
100644
(file)
--- a/
mdrun.c
+++ b/
mdrun.c
@@
-284,6
+284,14
@@
int mdrun_parse_config(t_mdrun *mdrun) {
mdrun->ly=atoi(word[3]);
mdrun->lz=atoi(word[4]);
mdrun->lc=atof(word[5]);
mdrun->ly=atoi(word[3]);
mdrun->lz=atoi(word[4]);
mdrun->lc=atof(word[5]);
+ if(wcnt==8) {
+ mdrun->fill_element=atoi(word[6]);
+ mdrun->fill_brand=atoi(word[7]);
+ }
+ else {
+ mdrun->fill_element=mdrun->element1;
+ mdrun->fill_brand=0;
+ }
}
else if(!strncmp(word[0],"aattr",5)) {
// for aatrib line we need a special stage
}
else if(!strncmp(word[0],"aattr",5)) {
// for aatrib line we need a special stage
@@
-1155,13
+1163,16
@@
int main(int argc,char **argv) {
set_pbc(&moldyn,mdrun.pbcx,mdrun.pbcy,mdrun.pbcz);
switch(mdrun.lattice) {
case FCC:
set_pbc(&moldyn,mdrun.pbcx,mdrun.pbcy,mdrun.pbcz);
switch(mdrun.lattice) {
case FCC:
- create_lattice(&moldyn,FCC,mdrun.lc,mdrun.element1,
- mdrun.m1,DEFAULT_ATOM_ATTR,0,mdrun.lx,
+ create_lattice(&moldyn,FCC,mdrun.lc,mdrun.fill_element,
+ mdrun.m1,DEFAULT_ATOM_ATTR,
+ mdrun.fill_brand,mdrun.lx,
mdrun.ly,mdrun.lz,NULL);
break;
case DIAMOND:
mdrun.ly,mdrun.lz,NULL);
break;
case DIAMOND:
- create_lattice(&moldyn,DIAMOND,mdrun.lc,mdrun.element1,
- mdrun.m1,DEFAULT_ATOM_ATTR,0,mdrun.lx,
+ create_lattice(&moldyn,DIAMOND,mdrun.lc,
+ mdrun.fill_element,
+ mdrun.m1,DEFAULT_ATOM_ATTR,
+ mdrun.fill_brand,mdrun.lx,
mdrun.ly,mdrun.lz,NULL);
break;
case ZINCBLENDE:
mdrun.ly,mdrun.lz,NULL);
break;
case ZINCBLENDE: