ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/nonbonded/InteractionManager.cpp
(Generate patch)

Comparing branches/development/src/nonbonded/InteractionManager.cpp (file contents):
Revision 1530 by gezelter, Tue Dec 28 21:47:55 2010 UTC vs.
Revision 1576 by gezelter, Wed Jun 8 16:05:07 2011 UTC

# Line 42 | Line 42 | namespace OpenMD {
42   #include "nonbonded/InteractionManager.hpp"
43  
44   namespace OpenMD {
45 –
46 –  bool InteractionManager::initialized_ = false;
47 –  RealType InteractionManager::rCut_ = -1.0;
48 –  RealType InteractionManager::rSwitch_ = -1.0;
49 –  ForceField* InteractionManager::forceField_ = NULL;  
50 –  InteractionManager* InteractionManager::_instance = NULL;
51 –  map<int, AtomType*> InteractionManager::typeMap_;
52 –  map<pair<AtomType*, AtomType*>, set<NonBondedInteraction*> > InteractionManager::interactions_;
45  
46 <  LJ* InteractionManager::lj_ = new LJ();
47 <  GB* InteractionManager::gb_ = new GB();
48 <  Sticky* InteractionManager::sticky_ = new Sticky();
49 <  Morse* InteractionManager::morse_ = new Morse();
50 <  EAM* InteractionManager::eam_ = new EAM();
51 <  SC* InteractionManager::sc_ = new SC();
52 <  Electrostatic* InteractionManager::electrostatic_ = new Electrostatic();
53 <  SwitchingFunction* InteractionManager::switcher_ = new SwitchingFunction();
54 <
55 <  InteractionManager* InteractionManager::Instance() {
56 <    if (!_instance) {
57 <      _instance = new InteractionManager();
66 <    }
67 <    return _instance;
46 >  InteractionManager::InteractionManager() {
47 >
48 >    initialized_ = false;
49 >        
50 >    lj_ = new LJ();
51 >    gb_ = new GB();
52 >    sticky_ = new Sticky();
53 >    morse_ = new Morse();
54 >    eam_ = new EAM();
55 >    sc_ = new SC();
56 >    electrostatic_ = new Electrostatic();
57 >    maw_ = new MAW();
58    }
59  
60    void InteractionManager::initialize() {
61      
62 +    ForceField* forceField_ = info_->getForceField();
63 +    
64      lj_->setForceField(forceField_);
65      gb_->setForceField(forceField_);
66      sticky_->setForceField(forceField_);
# Line 76 | Line 68 | namespace OpenMD {
68      sc_->setForceField(forceField_);
69      morse_->setForceField(forceField_);
70      electrostatic_->setForceField(forceField_);
71 +    maw_->setForceField(forceField_);
72  
80 –    ForceFieldOptions& fopts = forceField_->getForceFieldOptions();
81 –    // Force fields can set options on how to scale van der Waals and electrostatic
82 –    // interactions for atoms connected via bonds, bends and torsions
83 –    // in this case the topological distance between atoms is:
84 –    // 0 = the atom itself
85 –    // 1 = bonded together
86 –    // 2 = connected via a bend
87 –    // 3 = connected via a torsion
88 –
89 –    vdwScale_[0] = 0.0;
90 –    vdwScale_[1] = fopts.getvdw12scale();
91 –    vdwScale_[2] = fopts.getvdw13scale();
92 –    vdwScale_[3] = fopts.getvdw14scale();
93 –
94 –    electrostaticScale_[0] = 0.0;
95 –    electrostaticScale_[1] = fopts.getelectrostatic12scale();
96 –    electrostaticScale_[2] = fopts.getelectrostatic13scale();
97 –    electrostaticScale_[3] = fopts.getelectrostatic14scale();
98 –
73      ForceField::AtomTypeContainer* atomTypes = forceField_->getAtomTypes();
74      ForceField::AtomTypeContainer::MapTypeIterator i1, i2;
75      AtomType* atype1;
# Line 165 | Line 139 | namespace OpenMD {
139          // look for an explicitly-set non-bonded interaction type using the
140          // two atom types.
141          NonBondedInteractionType* nbiType = forceField_->getNonBondedInteractionType(atype1->getName(), atype2->getName());
142 +        
143 +        if (nbiType != NULL) {
144  
145 <        if (nbiType->isLennardJones()) {
146 <          // We found an explicit Lennard-Jones interaction.  
147 <          // override all other vdw entries for this pair of atom types:
148 <          set<NonBondedInteraction*>::iterator it;
149 <          for (it = interactions_[key].begin(); it != interactions_[key].end(); ++it) {
150 <            InteractionFamily ifam = (*it)->getFamily();
151 <            if (ifam == VANDERWAALS_FAMILY) interactions_[key].erase(*it);
145 >          if (nbiType->isLennardJones()) {
146 >            // We found an explicit Lennard-Jones interaction.  
147 >            // override all other vdw entries for this pair of atom types:
148 >            set<NonBondedInteraction*>::iterator it;
149 >            for (it = interactions_[key].begin();
150 >                 it != interactions_[key].end(); ++it) {
151 >              InteractionFamily ifam = (*it)->getFamily();
152 >              if (ifam == VANDERWAALS_FAMILY) interactions_[key].erase(*it);
153 >            }
154 >            interactions_[key].insert(lj_);
155 >            vdwExplicit = true;
156            }
157 <          interactions_[key].insert(lj_);
158 <          vdwExplicit = true;
159 <        }
160 <
161 <        if (nbiType->isMorse()) {
162 <          if (vdwExplicit) {
163 <            sprintf( painCave.errMsg,
164 <                     "InteractionManager::initialize found more than one explicit\n"
165 <                     "\tvan der Waals interaction for atom types %s - %s\n",
166 <                     atype1->getName().c_str(), atype2->getName().c_str());
167 <            painCave.severity = OPENMD_ERROR;
168 <            painCave.isFatal = 1;
169 <            simError();
157 >          
158 >          if (nbiType->isMorse()) {
159 >            if (vdwExplicit) {
160 >              sprintf( painCave.errMsg,
161 >                       "InteractionManager::initialize found more than one "
162 >                       "explicit \n"
163 >                       "\tvan der Waals interaction for atom types %s - %s\n",
164 >                       atype1->getName().c_str(), atype2->getName().c_str());
165 >              painCave.severity = OPENMD_ERROR;
166 >              painCave.isFatal = 1;
167 >              simError();
168 >            }
169 >            // We found an explicit Morse interaction.  
170 >            // override all other vdw entries for this pair of atom types:
171 >            set<NonBondedInteraction*>::iterator it;
172 >            for (it = interactions_[key].begin();
173 >                 it != interactions_[key].end(); ++it) {
174 >              InteractionFamily ifam = (*it)->getFamily();
175 >              if (ifam == VANDERWAALS_FAMILY) interactions_[key].erase(*it);
176 >            }
177 >            interactions_[key].insert(morse_);
178 >            vdwExplicit = true;
179            }
180 <          // We found an explicit Morse interaction.  
181 <          // override all other vdw entries for this pair of atom types:
182 <          set<NonBondedInteraction*>::iterator it;
183 <          for (it = interactions_[key].begin(); it != interactions_[key].end(); ++it) {
184 <            InteractionFamily ifam = (*it)->getFamily();
185 <            if (ifam == VANDERWAALS_FAMILY) interactions_[key].erase(*it);
180 >          
181 >          if (nbiType->isEAM()) {
182 >            // We found an explicit EAM interaction.  
183 >            // override all other metallic entries for this pair of atom types:
184 >            set<NonBondedInteraction*>::iterator it;
185 >            for (it = interactions_[key].begin();
186 >                 it != interactions_[key].end(); ++it) {
187 >              InteractionFamily ifam = (*it)->getFamily();
188 >              if (ifam == METALLIC_FAMILY) interactions_[key].erase(*it);
189 >            }
190 >            interactions_[key].insert(eam_);
191 >            metExplicit = true;
192            }
193 <          interactions_[key].insert(morse_);
194 <          vdwExplicit = true;
195 <        }
196 <
197 <        if (nbiType->isEAM()) {
198 <          // We found an explicit EAM interaction.  
199 <          // override all other metallic entries for this pair of atom types:
200 <          set<NonBondedInteraction*>::iterator it;
201 <          for (it = interactions_[key].begin(); it != interactions_[key].end(); ++it) {
202 <            InteractionFamily ifam = (*it)->getFamily();
203 <            if (ifam == METALLIC_FAMILY) interactions_[key].erase(*it);
193 >          
194 >          if (nbiType->isSC()) {
195 >            if (metExplicit) {
196 >              sprintf( painCave.errMsg,
197 >                       "InteractionManager::initialize found more than one "
198 >                       "explicit\n"
199 >                       "\tmetallic interaction for atom types %s - %s\n",
200 >                       atype1->getName().c_str(), atype2->getName().c_str());
201 >              painCave.severity = OPENMD_ERROR;
202 >              painCave.isFatal = 1;
203 >              simError();
204 >            }
205 >            // We found an explicit Sutton-Chen interaction.  
206 >            // override all other metallic entries for this pair of atom types:
207 >            set<NonBondedInteraction*>::iterator it;
208 >            for (it = interactions_[key].begin();
209 >                 it != interactions_[key].end(); ++it) {
210 >              InteractionFamily ifam = (*it)->getFamily();
211 >              if (ifam == METALLIC_FAMILY) interactions_[key].erase(*it);
212 >            }
213 >            interactions_[key].insert(sc_);
214 >            metExplicit = true;
215            }
216 <          interactions_[key].insert(eam_);
217 <          metExplicit = true;
216 >          
217 >          if (nbiType->isMAW()) {
218 >            if (vdwExplicit) {
219 >              sprintf( painCave.errMsg,
220 >                       "InteractionManager::initialize found more than one "
221 >                       "explicit\n"
222 >                       "\tvan der Waals interaction for atom types %s - %s\n",
223 >                       atype1->getName().c_str(), atype2->getName().c_str());
224 >              painCave.severity = OPENMD_ERROR;
225 >              painCave.isFatal = 1;
226 >              simError();
227 >            }
228 >            // We found an explicit MAW interaction.  
229 >            // override all other vdw entries for this pair of atom types:
230 >            set<NonBondedInteraction*>::iterator it;
231 >            for (it = interactions_[key].begin();
232 >                 it != interactions_[key].end(); ++it) {
233 >              InteractionFamily ifam = (*it)->getFamily();
234 >              if (ifam == VANDERWAALS_FAMILY) interactions_[key].erase(*it);
235 >            }
236 >            interactions_[key].insert(maw_);
237 >            vdwExplicit = true;
238 >          }        
239          }
213 –
214 –        if (nbiType->isSC()) {
215 –          if (metExplicit) {
216 –            sprintf( painCave.errMsg,
217 –                     "InteractionManager::initialize found more than one explicit\n"
218 –                     "\tmetallic interaction for atom types %s - %s\n",
219 –                     atype1->getName().c_str(), atype2->getName().c_str());
220 –            painCave.severity = OPENMD_ERROR;
221 –            painCave.isFatal = 1;
222 –            simError();
223 –          }
224 –          // We found an explicit Sutton-Chen interaction.  
225 –          // override all other metallic entries for this pair of atom types:
226 –          set<NonBondedInteraction*>::iterator it;
227 –          for (it = interactions_[key].begin(); it != interactions_[key].end(); ++it) {
228 –            InteractionFamily ifam = (*it)->getFamily();
229 –            if (ifam == METALLIC_FAMILY) interactions_[key].erase(*it);
230 –          }
231 –          interactions_[key].insert(sc_);
232 –          metExplicit = true;
233 –        }
240        }
241      }
242      
243 <    // make sure every pair of atom types has a non-bonded interaction:
244 <    for (atype1 = atomTypes->beginType(i1); atype1 != NULL;
245 <         atype1 = atomTypes->nextType(i1)) {
246 <      for (atype2 = atomTypes->beginType(i2); atype2 != NULL;
247 <           atype2 = atomTypes->nextType(i2)) {
243 >    
244 >    // make sure every pair of atom types in this simulation has a
245 >    // non-bonded interaction:
246 >
247 >    set<AtomType*> simTypes = info_->getSimulatedAtomTypes();
248 >    set<AtomType*>::iterator it, jt;
249 >    for (it = simTypes.begin(); it != simTypes.end(); ++it) {
250 >      atype1 = (*it);
251 >      for (jt = simTypes.begin(); jt != simTypes.end(); ++jt) {
252 >        atype2 = (*jt);
253          key = make_pair(atype1, atype2);
254          
255          if (interactions_[key].size() == 0) {
# Line 252 | Line 263 | namespace OpenMD {
263          }
264        }
265      }
266 <  }
266 >
267 >    initialized_ = true;
268 >  }
269    
270 <  void InteractionManager::doPrePair(int *atid1, int *atid2, RealType *rij, RealType *rho_i_at_j, RealType *rho_j_at_i){
270 >  void InteractionManager::doPrePair(InteractionData idat){
271      
272      if (!initialized_) initialize();
273 <          
261 <    DensityData ddat;
262 <
263 <    ddat.atype1 = typeMap_[*atid1];
264 <    ddat.atype2 = typeMap_[*atid2];
265 <    ddat.rij = *rij;
266 <    ddat.rho_i_at_j = *rho_i_at_j;
267 <    ddat.rho_j_at_i = *rho_j_at_i;
268 <
269 <    pair<AtomType*, AtomType*> key = make_pair(ddat.atype1, ddat.atype2);
273 >        
274      set<NonBondedInteraction*>::iterator it;
275  
276 <    for (it = interactions_[key].begin(); it != interactions_[key].end(); ++it){
276 >    for (it = interactions_[ idat.atypes ].begin();
277 >         it != interactions_[ idat.atypes ].end(); ++it){
278        if ((*it)->getFamily() == METALLIC_FAMILY) {
279 <        dynamic_cast<MetallicInteraction*>(*it)->calcDensity(ddat);
279 >        dynamic_cast<MetallicInteraction*>(*it)->calcDensity(idat);
280        }
281      }
282      
283      return;    
284    }
285    
286 <  void InteractionManager::doPreForce(int *atid, RealType *rho, RealType *frho, RealType *dfrhodrho){
286 >  void InteractionManager::doPreForce(SelfData sdat){
287  
288      if (!initialized_) initialize();
289 <          
290 <    FunctionalData fdat;
286 <
287 <    fdat.atype = typeMap_[*atid];
288 <    fdat.rho = *rho;
289 <    fdat.frho = *frho;
290 <    fdat.dfrhodrho = *dfrhodrho;
291 <
292 <    pair<AtomType*, AtomType*> key = make_pair(fdat.atype, fdat.atype);
289 >    
290 >    pair<AtomType*, AtomType*> key = make_pair(sdat.atype, sdat.atype);
291      set<NonBondedInteraction*>::iterator it;
292      
293      for (it = interactions_[key].begin(); it != interactions_[key].end(); ++it){
294        if ((*it)->getFamily() == METALLIC_FAMILY) {
295 <        dynamic_cast<MetallicInteraction*>(*it)->calcFunctional(fdat);
295 >        dynamic_cast<MetallicInteraction*>(*it)->calcFunctional(sdat);
296        }
297      }
298      
299      return;    
300    }
301  
302 <  void InteractionManager::doPair(int *atid1, int *atid2, RealType *d, RealType *r, RealType *r2, RealType *rcut, RealType *sw, int *topoDist, RealType *pot, RealType *vpair, RealType *f1, RealType *eFrame1, RealType *eFrame2, RealType *A1, RealType *A2, RealType *t1, RealType *t2, RealType *rho1, RealType *rho2, RealType *dfrho1, RealType *dfrho2, RealType *fshift1, RealType *fshift2){
302 >  void InteractionManager::doPair(InteractionData idat){
303      
304      if (!initialized_) initialize();
305 <    
308 <    InteractionData idat;
309 <    
310 <    idat.atype1 = typeMap_[*atid1];
311 <    idat.atype2 = typeMap_[*atid2];
312 <    idat.d = Vector3d(d);
313 <    idat.rij = *r;
314 <    idat.r2 = *r2;
315 <    idat.rcut = *rcut;
316 <    idat.sw = *sw;
317 <    idat.vdwMult = vdwScale_[*topoDist];
318 <    idat.electroMult = electrostaticScale_[*topoDist];
319 <    idat.pot = *pot;
320 <    idat.vpair = *vpair;
321 <    idat.f1 = Vector3d(f1);
322 <    idat.eFrame1 = Mat3x3d(eFrame1);
323 <    idat.eFrame2 = Mat3x3d(eFrame2);
324 <    idat.A1 = RotMat3x3d(A1);
325 <    idat.A2 = RotMat3x3d(A2);
326 <    idat.t1 = Vector3d(t1);
327 <    idat.t2 = Vector3d(t2);
328 <    idat.rho1 = *rho1;
329 <    idat.rho2 = *rho2;
330 <    idat.dfrho1 = *dfrho1;
331 <    idat.dfrho2 = *dfrho2;
332 <    idat.fshift1 = *fshift1;
333 <    idat.fshift2 = *fshift2;
334 <
335 <    pair<AtomType*, AtomType*> key = make_pair(idat.atype1, idat.atype2);
305 >  
306      set<NonBondedInteraction*>::iterator it;
307  
308 <    for (it = interactions_[key].begin(); it != interactions_[key].end(); ++it)
308 >    for (it = interactions_[ idat.atypes ].begin();
309 >         it != interactions_[ idat.atypes ].end(); ++it)
310        (*it)->calcForce(idat);
311      
341 –    f1[0] = idat.f1.x();
342 –    f1[1] = idat.f1.y();
343 –    f1[2] = idat.f1.z();
344 –    
345 –    t1[0] = idat.t1.x();
346 –    t1[1] = idat.t1.y();
347 –    t1[2] = idat.t1.z();
348 –    
349 –    t2[0] = idat.t2.x();
350 –    t2[1] = idat.t2.y();
351 –    t2[2] = idat.t2.z();
352 –
312      return;    
313    }
314  
315 <  void InteractionManager::doSkipCorrection(int *atid1, int *atid2, RealType *d, RealType *r, RealType *skippedCharge1, RealType *skippedCharge2, RealType *sw, RealType *electroMult, RealType *pot, RealType *vpair, RealType *f1, RealType *eFrame1, RealType *eFrame2, RealType *t1, RealType *t2){
315 >  void InteractionManager::doSkipCorrection(InteractionData idat){
316  
317 <    if (!initialized_) initialize();
317 >    if (!initialized_) initialize();  
318      
360 –    SkipCorrectionData skdat;
361 –    
362 –    skdat.atype1 = typeMap_[*atid1];
363 –    skdat.atype2 = typeMap_[*atid2];
364 –    skdat.d = Vector3d(d);
365 –    skdat.rij = *r;
366 –    skdat.skippedCharge1 = *skippedCharge1;
367 –    skdat.skippedCharge2 = *skippedCharge2;
368 –    skdat.sw = *sw;
369 –    skdat.electroMult = *electroMult;
370 –    skdat.pot = *pot;
371 –    skdat.vpair = *vpair;
372 –    skdat.f1 = Vector3d(f1);
373 –    skdat.eFrame1 = Mat3x3d(eFrame1);
374 –    skdat.eFrame2 = Mat3x3d(eFrame2);
375 –    skdat.t1 = Vector3d(t1);
376 –    skdat.t2 = Vector3d(t2);
377 –
378 –    pair<AtomType*, AtomType*> key = make_pair(skdat.atype1, skdat.atype2);
319      set<NonBondedInteraction*>::iterator it;
320  
321 <    for (it = interactions_[key].begin(); it != interactions_[key].end(); ++it){
321 >    for (it = interactions_[ idat.atypes ].begin();
322 >         it != interactions_[ idat.atypes ].end(); ++it){
323        if ((*it)->getFamily() == ELECTROSTATIC_FAMILY) {
324 <        dynamic_cast<ElectrostaticInteraction*>(*it)->calcSkipCorrection(skdat);
324 >        dynamic_cast<ElectrostaticInteraction*>(*it)->calcSkipCorrection(idat);
325        }
326      }
327      
387 –    f1[0] = skdat.f1.x();
388 –    f1[1] = skdat.f1.y();
389 –    f1[2] = skdat.f1.z();
390 –    
391 –    t1[0] = skdat.t1.x();
392 –    t1[1] = skdat.t1.y();
393 –    t1[2] = skdat.t1.z();
394 –    
395 –    t2[0] = skdat.t2.x();
396 –    t2[1] = skdat.t2.y();
397 –    t2[2] = skdat.t2.z();
398 –
328      return;    
329    }
330  
331 <  void InteractionManager::doSelfCorrection(int *atid, RealType *eFrame, RealType *skippedCharge, RealType *pot, RealType *t){
331 >  void InteractionManager::doSelfCorrection(SelfData sdat){
332  
333      if (!initialized_) initialize();
334      
335 <    SelfCorrectionData scdat;
407 <    
408 <    scdat.atype = typeMap_[*atid];
409 <    scdat.eFrame = Mat3x3d(eFrame);
410 <    scdat.skippedCharge = *skippedCharge;
411 <    scdat.pot = *pot;
412 <    scdat.t = Vector3d(t);
413 <
414 <    pair<AtomType*, AtomType*> key = make_pair(scdat.atype, scdat.atype);
335 >    pair<AtomType*, AtomType*> key = make_pair(sdat.atype, sdat.atype);
336      set<NonBondedInteraction*>::iterator it;
337  
338      for (it = interactions_[key].begin(); it != interactions_[key].end(); ++it){
339        if ((*it)->getFamily() == ELECTROSTATIC_FAMILY) {
340 <        dynamic_cast<ElectrostaticInteraction*>(*it)->calcSelfCorrection(scdat);
340 >        dynamic_cast<ElectrostaticInteraction*>(*it)->calcSelfCorrection(sdat);
341        }
342      }
343 <        
423 <    t[0] = scdat.t.x();
424 <    t[1] = scdat.t.y();
425 <    t[2] = scdat.t.z();
426 <
343 >      
344      return;    
345    }
346  
430 –
347    RealType InteractionManager::getSuggestedCutoffRadius(int *atid) {
348      if (!initialized_) initialize();
349      
# Line 438 | Line 354 | namespace OpenMD {
354      RealType cutoff = 0.0;
355      
356      for (it = interactions_[key].begin(); it != interactions_[key].end(); ++it)
357 <      cutoff = max(cutoff, (*it)->getSuggestedCutoffRadius(atype, atype));  
357 >      cutoff = max(cutoff, (*it)->getSuggestedCutoffRadius(key));  
358      return cutoff;    
359    }
360  
# Line 450 | Line 366 | namespace OpenMD {
366      RealType cutoff = 0.0;
367      
368      for (it = interactions_[key].begin(); it != interactions_[key].end(); ++it)
369 <      cutoff = max(cutoff, (*it)->getSuggestedCutoffRadius(atype, atype));  
369 >      cutoff = max(cutoff, (*it)->getSuggestedCutoffRadius(key));  
370      return cutoff;    
371    }
456 –
457 –
458 –  void InteractionManager::setSwitch(RealType *rIn, RealType *rOut) {
459 –    switcher_->setSwitch(*rIn, *rOut);    
460 –  }
461 –
462 –  void InteractionManager::getSwitch(RealType *r2, RealType *sw, RealType *dswdr, RealType *r,
463 –                                     int *in_switching_region) {
464 –    bool isr = switcher_->getSwitch(*r2, *sw, *dswdr, *r);    
465 –    *in_switching_region = (int)isr;
466 –  }
467 –
372   } //end namespace OpenMD
469 –
470 – extern "C" {
471 –  
472 – #define fortranDoPrePair FC_FUNC(do_prepair, DO_PREPAIR)
473 – #define fortranDoPreForce FC_FUNC(do_preforce, DO_PREFORCE)
474 – #define fortranDoPair FC_FUNC(do_pair, DO_PAIR)
475 – #define fortranDoSkipCorrection FC_FUNC(do_skip_correction, DO_SKIP_CORRECTION)
476 – #define fortranDoSelfCorrection FC_FUNC(do_self_correction, DO_SELF_CORRECTION)
477 – #define fortranGetCutoff FC_FUNC(get_cutoff, GET_CUTOFF)
478 – #define fortranSetSwitch FC_FUNC(set_switch, SET_SWITCH)
479 – #define fortranGetSwitch FC_FUNC(get_switch, GET_SWITCH)
480 –
481 –  void fortranDoPrePair(int *atid1, int *atid2, RealType *rij,
482 –                        RealType *rho_i_at_j, RealType *rho_j_at_i) {
483 –            
484 –    return OpenMD::InteractionManager::Instance()->doPrePair(atid1, atid2, rij,
485 –                                                             rho_i_at_j,  
486 –                                                             rho_j_at_i);
487 –  }
488 –  void fortranDoPreForce(int *atid, RealType *rho, RealType *frho,
489 –                         RealType *dfrhodrho) {  
490 –    
491 –    return OpenMD::InteractionManager::Instance()->doPreForce(atid, rho, frho,
492 –                                                              dfrhodrho);    
493 –  }
494 –  
495 –  void fortranDoPair(int *atid1, int *atid2, RealType *d, RealType *r,
496 –                     RealType *r2, RealType *rcut, RealType *sw, int *topoDist,
497 –                     RealType *pot, RealType *vpair, RealType *f1, RealType *eFrame1,
498 –                     RealType *eFrame2, RealType *A1, RealType *A2,
499 –                     RealType *t1, RealType *t2, RealType *rho1, RealType *rho2,
500 –                     RealType *dfrho1, RealType *dfrho2, RealType *fshift1,
501 –                     RealType *fshift2){
502 –    
503 –    return OpenMD::InteractionManager::Instance()->doPair(atid1, atid2, d, r,
504 –                                                          r2, rcut, sw, topoDist,
505 –                                                          pot, vpair, f1,
506 –                                                          eFrame1, eFrame2,
507 –                                                          A1, A2, t1, t2, rho1,
508 –                                                          rho2, dfrho1, dfrho2,
509 –                                                          fshift1, fshift2);
510 –  }
511 –  
512 –  void fortranDoSkipCorrection(int *atid1, int *atid2, RealType *d,
513 –                               RealType *r, RealType *skippedCharge1,
514 –                               RealType *skippedCharge2, RealType *sw,
515 –                               RealType *electroMult, RealType *pot,
516 –                               RealType *vpair, RealType *f1,
517 –                               RealType *eFrame1, RealType *eFrame2,
518 –                               RealType *t1, RealType *t2){
519 –    
520 –    return OpenMD::InteractionManager::Instance()->doSkipCorrection(atid1,
521 –                                                                    atid2, d,
522 –                                                                    r,
523 –                                                                    skippedCharge1,
524 –                                                                    skippedCharge2,
525 –                                                                    sw, electroMult, pot,
526 –                                                                    vpair, f1, eFrame1,
527 –                                                                    eFrame2, t1, t2);
528 –  }
529 –  
530 –  void fortranDoSelfCorrection(int *atid, RealType *eFrame, RealType *skippedCharge,
531 –                               RealType *pot, RealType *t) {
532 –    
533 –    return OpenMD::InteractionManager::Instance()->doSelfCorrection(atid,
534 –                                                                    eFrame,
535 –                                                                    skippedCharge,
536 –                                                                    pot, t);
537 –  }
538 –  RealType fortranGetCutoff(int *atid) {    
539 –    return OpenMD::InteractionManager::Instance()->getSuggestedCutoffRadius(atid);
540 –  }
541 –
542 –  void fortranGetSwitch(RealType *r2, RealType *sw, RealType *dswdr, RealType *r,
543 –                        int *in_switching_region) {
544 –    
545 –    return OpenMD::InteractionManager::Instance()->getSwitch(r2, sw, dswdr, r,
546 –                                                             in_switching_region);
547 –  }
548 –
549 –  void fortranSetSwitch(RealType *rIn, RealType *rOut) {    
550 –    return OpenMD::InteractionManager::Instance()->setSwitch(rIn, rOut);
551 –  }
552 –  
553 – }

Diff Legend

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