68 |
|
atp.is_SplitDipole = 0; |
69 |
|
atp.is_Quadrupole = 0; |
70 |
|
atp.is_Sticky = 0; |
71 |
+ |
atp.is_StickyPower = 0; |
72 |
|
atp.is_GayBerne = 0; |
73 |
|
atp.is_EAM = 0; |
74 |
|
atp.is_Shape = 0; |
99 |
|
|
100 |
|
status = 0; |
101 |
|
|
101 |
– |
|
102 |
– |
std::cout << "Calling makeAtype with atp.ident = " << atp.ident << "\n"; |
103 |
– |
|
102 |
|
makeAtype(&atp, &status); |
103 |
|
|
104 |
|
if (status != 0) { |
124 |
|
if (ljData != NULL) { |
125 |
|
LJParam ljParam = ljData->getData(); |
126 |
|
|
127 |
< |
newLJtype(&atp.ident, &ljParam.sigma, &ljParam.epsilon, &ljParam.soft_pot, &isError); |
127 |
> |
newLJtype(&atp.ident, &ljParam.sigma, &ljParam.epsilon, &ljParam.soft_pot, |
128 |
> |
&isError); |
129 |
|
|
130 |
|
if (isError != 0) { |
131 |
|
sprintf( painCave.errMsg, |
202 |
|
EAMParam eamParam = eamData->getData(); |
203 |
|
|
204 |
|
|
205 |
< |
newEAMtype(&eamParam.latticeConstant, &eamParam.nrho, &eamParam.drho, &eamParam.nr, &eamParam.dr, &eamParam.rcut, |
206 |
< |
&eamParam.rvals[0], &eamParam.rhovals[0], &eamParam.Frhovals[0], &atp.ident, &isError ); |
205 |
> |
newEAMtype(&eamParam.latticeConstant, &eamParam.nrho, &eamParam.drho, |
206 |
> |
&eamParam.nr, &eamParam.dr, &eamParam.rcut, &eamParam.rvals[0], |
207 |
> |
&eamParam.rhovals[0], &eamParam.Frhovals[0], &atp.ident, |
208 |
> |
&isError ); |
209 |
|
|
210 |
|
if (isError != 0) { |
211 |
|
sprintf( painCave.errMsg, |