ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-3.0/src/types/DirectionalAtomType.cpp
(Generate patch)

Comparing trunk/OOPSE-3.0/src/types/DirectionalAtomType.cpp (file contents):
Revision 2097 by tim, Wed Mar 9 17:30:29 2005 UTC vs.
Revision 2220 by chrisfen, Thu May 5 14:47:35 2005 UTC

# Line 160 | Line 160 | namespace oopse {
160      }
161      
162      //setup sticky atom type in fortran side
163 <    if (isSticky()) {
163 >    if (isSticky() || isStickyPower()) {
164        data = getPropertyByName("Sticky");
165        if (data != NULL) {
166          StickyParamGenericData* stickyData = dynamic_cast<StickyParamGenericData*>(data);
# Line 168 | Line 168 | namespace oopse {
168          if (stickyData != NULL) {
169            StickyParam stickyParam = stickyData->getData();
170  
171 <          newStickyType(&atp.ident,&stickyParam.w0, &stickyParam.v0, &stickyParam.v0p, &stickyParam.rl,
172 <                        &stickyParam.ru, &stickyParam.rlp, &stickyParam.rup, &isError);
171 >          newStickyType(&atp.ident,&stickyParam.w0, &stickyParam.v0,
172 >                        &stickyParam.v0p, &stickyParam.rl, &stickyParam.ru,
173 >                        &stickyParam.rlp, &stickyParam.rup, &isError);
174            if (isError != 0) {
175              sprintf( painCave.errMsg,
176                       "Fortran rejected newLJtype\n");
# Line 197 | Line 198 | namespace oopse {
198  
199    }
200  
200 –
201   } //end namespace oopse

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines