62 |
|
|
63 |
|
ForceManager::ForceManager(SimInfo * info) : info_(info), |
64 |
|
NBforcesInitialized_(false) { |
65 |
– |
std::cerr << __PRETTY_FUNCTION__ << "\n"; |
66 |
– |
lj_ = new LJ(info_->getForceField()); |
65 |
|
} |
66 |
|
|
67 |
|
void ForceManager::calcForces() { |
68 |
|
|
69 |
< |
std::cerr << __PRETTY_FUNCTION__ << "\n"; |
69 |
> |
|
70 |
|
if (!info_->isFortranInitialized()) { |
71 |
|
info_->update(); |
72 |
+ |
nbiMan_->setSimInfo(info_); |
73 |
+ |
nbiMan_->initialize(); |
74 |
+ |
info_->setupFortran(); |
75 |
|
} |
76 |
|
|
76 |
– |
if (!NBforcesInitialized_) { |
77 |
– |
lj_->initialize(); |
78 |
– |
} |
79 |
– |
|
77 |
|
preCalculation(); |
78 |
|
|
79 |
|
calcShortRangeInteraction(); |
284 |
|
//initialize data before passing to fortran |
285 |
|
RealType longRangePotential[LR_POT_TYPES]; |
286 |
|
RealType lrPot = 0.0; |
290 |
– |
Vector3d totalDipole; |
287 |
|
int isError = 0; |
288 |
|
|
289 |
|
for (int i=0; i<LR_POT_TYPES;i++){ |
310 |
|
for (int i=0; i<LR_POT_TYPES;i++){ |
311 |
|
lrPot += longRangePotential[i]; //Quick hack |
312 |
|
} |
313 |
< |
|
318 |
< |
// grab the simulation box dipole moment if specified |
319 |
< |
if (info_->getCalcBoxDipole()){ |
320 |
< |
getAccumulatedBoxDipole(totalDipole.getArrayPointer()); |
321 |
< |
|
322 |
< |
curSnapshot->statData[Stats::BOX_DIPOLE_X] = totalDipole(0); |
323 |
< |
curSnapshot->statData[Stats::BOX_DIPOLE_Y] = totalDipole(1); |
324 |
< |
curSnapshot->statData[Stats::BOX_DIPOLE_Z] = totalDipole(2); |
325 |
< |
} |
326 |
< |
|
313 |
> |
|
314 |
|
//store the tau and long range potential |
315 |
|
curSnapshot->statData[Stats::LONG_RANGE_POTENTIAL] = lrPot; |
316 |
|
curSnapshot->statData[Stats::VANDERWAALS_POTENTIAL] = longRangePotential[VDW_POT]; |