57 |
|
#include "primitives/Bend.hpp" |
58 |
|
namespace oopse { |
59 |
|
|
60 |
+ |
/* |
61 |
|
struct BendOrderStruct { |
62 |
|
Bend* bend; |
63 |
|
BendDataSet dataSet; |
74 |
|
bool TorsionSortFunctor(const TorsionOrderStruct& t1, const TorsionOrderStruct& t2) { |
75 |
|
return t1.dataSet.deltaV < t2.dataSet.deltaV; |
76 |
|
} |
77 |
< |
|
77 |
> |
*/ |
78 |
|
void ForceManager::calcForces(bool needPotential, bool needStress) { |
79 |
|
|
80 |
|
if (!info_->isFortranInitialized()) { |
89 |
|
|
90 |
|
postCalculation(); |
91 |
|
|
92 |
+ |
/* |
93 |
|
std::vector<BendOrderStruct> bendOrderStruct; |
94 |
|
for(std::map<Bend*, BendDataSet>::iterator i = bendDataSets.begin(); i != bendDataSets.end(); ++i) { |
95 |
|
BendOrderStruct tmp; |
120 |
|
std::cout << "atom1=" <<torsion->getAtomA()->getGlobalIndex() << ",atom2 = "<< torsion->getAtomB()->getGlobalIndex() << ",atom3="<<torsion->getAtomC()->getGlobalIndex() << ",atom4="<<torsion->getAtomD()->getGlobalIndex()<< " "; |
121 |
|
std::cout << "deltaV=" << l->dataSet.deltaV << ",p_theta=" << l->dataSet.prev.angle <<",p_pot=" << l->dataSet.prev.potential<< ",c_theta=" << l->dataSet.curr.angle << ", c_pot = " << l->dataSet.curr.potential <<std::endl; |
122 |
|
} |
123 |
< |
|
123 |
> |
*/ |
124 |
|
} |
125 |
|
|
126 |
|
void ForceManager::preCalculation() { |
174 |
|
bondPotential += bond->getPotential(); |
175 |
|
} |
176 |
|
|
177 |
< |
//int i =0; |
177 |
> |
|
178 |
|
for (bend = mol->beginBend(bendIter); bend != NULL; bend = mol->nextBend(bendIter)) { |
179 |
< |
//std::cout << i++ << "\t"; |
179 |
> |
|
180 |
|
double angle; |
181 |
|
bend->calcForce(angle); |
182 |
|
double currBendPot = bend->getPotential(); |