161 |
|
} |
162 |
|
|
163 |
|
//setup sticky atom type in fortran side |
164 |
< |
if (isSticky()) { |
164 |
> |
if (isSticky() || isStickyPower()) { |
165 |
|
data = getPropertyByName("Sticky"); |
166 |
|
if (data != NULL) { |
167 |
|
StickyParamGenericData* stickyData = dynamic_cast<StickyParamGenericData*>(data); |
169 |
|
if (stickyData != NULL) { |
170 |
|
StickyParam stickyParam = stickyData->getData(); |
171 |
|
|
172 |
< |
newStickyType(&atp.ident,&stickyParam.w0, &stickyParam.v0, &stickyParam.v0p, &stickyParam.rl, |
173 |
< |
&stickyParam.ru, &stickyParam.rlp, &stickyParam.rup, &isError); |
172 |
> |
newStickyType(&atp.ident,&stickyParam.w0, &stickyParam.v0, |
173 |
> |
&stickyParam.v0p, &stickyParam.rl, &stickyParam.ru, |
174 |
> |
&stickyParam.rlp, &stickyParam.rup, &isError); |
175 |
|
if (isError != 0) { |
176 |
|
sprintf( painCave.errMsg, |
177 |
|
"Fortran rejected newLJtype\n"); |
204 |
|
if (gayBerneData != NULL) { |
205 |
|
GayBerneParam gayBerneParam = gayBerneData->getData(); |
206 |
|
|
207 |
< |
/**@todo change fortran interface */ |
208 |
< |
//makeGayBerneType(&atp.ident, &gayBerneParam.w0, &gayBerneParam.v0, &gayBerneParam.v0p, &gayBerneParam.rl, |
209 |
< |
// &gayBerneParam.ru, &gayBerneParam.rlp, &gayBerneParam.rup); |
210 |
< |
newGayBerneType(&gayBerneParam.GB_sigma, &gayBerneParam.GB_12b_ratio, &gayBerneParam.GB_eps, |
211 |
< |
&gayBerneParam.GB_eps_ratio, &gayBerneParam.GB_mu, &gayBerneParam.GB_nu); |
207 |
> |
newGayBerneType(&atp.ident, |
208 |
> |
&gayBerneParam.GB_sigma, |
209 |
> |
&gayBerneParam.GB_l2b_ratio, |
210 |
> |
&gayBerneParam.GB_eps, |
211 |
> |
&gayBerneParam.GB_eps_ratio, |
212 |
> |
&gayBerneParam.GB_mu, |
213 |
> |
&gayBerneParam.GB_nu, &isError); |
214 |
> |
|
215 |
|
if (isError != 0) { |
216 |
|
sprintf( painCave.errMsg, |
217 |
< |
"Fortran rejected newGayBernetype\n"); |
217 |
> |
"Fortran rejected newGayBerneType\n"); |
218 |
|
painCave.severity = OOPSE_ERROR; |
219 |
|
painCave.isFatal = 1; |
220 |
|
simError(); |