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

Comparing trunk/OOPSE-4/src/types/DirectionalAtomType.cpp (file contents):
Revision 2220 by chrisfen, Thu May 5 14:47:35 2005 UTC vs.
Revision 2226 by kdaily, Tue May 17 02:09:25 2005 UTC

# Line 42 | Line 42
42   #include "types/DirectionalAtomType.hpp"
43   #include "UseTheForce/DarkSide/electrostatic_interface.h"
44   #include "UseTheForce/DarkSide/sticky_interface.h"
45 + #include "UseTheForce/DarkSide/gb_interface.h"
46   #include "utils/simError.h"
47   namespace oopse {
48  
# Line 160 | Line 161 | namespace oopse {
161      }
162      
163      //setup sticky atom type in fortran side
164 <    if (isSticky() || isStickyPower()) {
164 >    if (isSticky()) {
165        data = getPropertyByName("Sticky");
166        if (data != NULL) {
167          StickyParamGenericData* stickyData = dynamic_cast<StickyParamGenericData*>(data);
# Line 168 | Line 169 | namespace oopse {
169          if (stickyData != NULL) {
170            StickyParam stickyParam = stickyData->getData();
171  
172 <          newStickyType(&atp.ident,&stickyParam.w0, &stickyParam.v0,
173 <                        &stickyParam.v0p, &stickyParam.rl, &stickyParam.ru,
173 <                        &stickyParam.rlp, &stickyParam.rup, &isError);
172 >          newStickyType(&atp.ident,&stickyParam.w0, &stickyParam.v0, &stickyParam.v0p, &stickyParam.rl,
173 >                        &stickyParam.ru, &stickyParam.rlp, &stickyParam.rup, &isError);
174            if (isError != 0) {
175              sprintf( painCave.errMsg,
176                       "Fortran rejected newLJtype\n");
# Line 195 | Line 195 | namespace oopse {
195      }
196  
197      //setup GayBerne type in fortran side
198 +      if (isGayBerne()) {
199 +        data = getPropertyByName("GayBerne");
200 +        if (data != NULL) {
201 +            GayBerneParamGenericData* gayBerneData = dynamic_cast<GayBerneParamGenericData*>(data);
202  
203 <  }
203 >            if (gayBerneData != NULL) {
204 >                GayBerneParam gayBerneParam = gayBerneData->getData();
205  
206 +                /**@todo change fortran interface */
207 +                //makeGayBerneType(&atp.ident, &gayBerneParam.w0, &gayBerneParam.v0, &gayBerneParam.v0p, &gayBerneParam.rl,
208 +                //    &gayBerneParam.ru, &gayBerneParam.rlp, &gayBerneParam.rup);
209 +                newGayBerneType(&gayBerneParam.GB_sigma, &gayBerneParam.GB_12b_ratio, &gayBerneParam.GB_eps,
210 +                                &gayBerneParam.GB_eps_ratio, &gayBerneParam.GB_mu, &gayBerneParam.GB_nu);
211 +                if (isError != 0) {
212 +                    sprintf( painCave.errMsg,
213 +                           "Fortran rejected newGayBernetype\n");
214 +                    painCave.severity = OOPSE_ERROR;
215 +                    painCave.isFatal = 1;
216 +                    simError();          
217 +                }
218 +                
219 +            }
220 +            
221 +            else {
222 +                    sprintf( painCave.errMsg,
223 +                           "Can not cast GenericData to GayBerneParam\n");
224 +                    painCave.severity = OOPSE_ERROR;
225 +                    painCave.isFatal = 1;
226 +                    simError();          
227 +            }            
228 +        }
229 +        else {
230 +          sprintf( painCave.errMsg, "Can not find Parameters for GayBerne\n");
231 +          painCave.severity = OOPSE_ERROR;
232 +          painCave.isFatal = 1;
233 +          simError();          
234 +        }
235 +    }
236 + }
237 +
238 +
239 +
240   } //end namespace oopse

Diff Legend

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