| 45 |
|
* |
| 46 |
|
* Created by Charles F. Vardeman II on 14 Dec 2006. |
| 47 |
|
* @author Charles F. Vardeman II |
| 48 |
< |
* @version $Id: NanoVolume.cpp,v 1.6 2008-01-08 19:36:28 chuckv Exp $ |
| 48 |
> |
* @version $Id: NanoVolume.cpp,v 1.7 2008-09-14 01:32:23 chuckv Exp $ |
| 49 |
|
* |
| 50 |
|
*/ |
| 51 |
|
|
| 52 |
|
#include "applications/staticProps/NanoVolume.hpp" |
| 53 |
|
#include "math/ConvexHull.hpp" |
| 54 |
< |
#include "math/AlphaShape.hpp" |
| 54 |
> |
//#include "math/AlphaShape.hpp" |
| 55 |
|
#include "utils/simError.h" |
| 56 |
|
#include "io/DumpReader.hpp" |
| 57 |
|
#include "primitives/Molecule.hpp" |
| 87 |
|
int i,j; |
| 88 |
|
|
| 89 |
|
#ifdef HAVE_QHULL |
| 90 |
< |
ConvexHull* hull = new ConvexHull(); |
| 90 |
> |
ConvexHull* thishull = new ConvexHull(); |
| 91 |
|
#endif |
| 92 |
|
#ifdef HAVE_CGAL |
| 93 |
< |
AlphaShape* hull = new AlphaShape(); |
| 93 |
> |
// AlphaShape* hull = new AlphaShape(); |
| 94 |
> |
ConvexHull* thishull = new ConvexHull(); |
| 95 |
|
#endif |
| 96 |
|
|
| 97 |
|
DumpReader reader(info_, dumpFilename_); |
| 98 |
|
int nFrames = reader.getNFrames(); |
| 99 |
|
frameCounter_ = 0; |
| 100 |
|
|
| 101 |
< |
pos_.reserve(info_->getNGlobalAtoms()); |
| 101 |
> |
theAtoms_.reserve(info_->getNGlobalAtoms()); |
| 102 |
|
|
| 103 |
|
for (int istep = 0; istep < nFrames; istep += step_) { |
| 104 |
|
reader.readFrame(istep); |
| 106 |
|
currentSnapshot_ = info_->getSnapshotManager()->getCurrentSnapshot(); |
| 107 |
|
|
| 108 |
|
// Clear pos vector between each frame. |
| 109 |
< |
pos_.clear(); |
| 109 |
> |
theAtoms_.clear(); |
| 110 |
|
|
| 111 |
|
if (evaluator_.isDynamic()) { |
| 112 |
|
seleMan_.setSelectionSet(evaluator_.evaluate()); |
| 123 |
|
} |
| 124 |
|
|
| 125 |
|
// outer loop is over the selected StuntDoubles: |
| 126 |
< |
|
| 126 |
> |
/* |
| 127 |
|
for (sd = seleMan_.beginSelected(i); sd != NULL; |
| 128 |
< |
sd = seleMan_.nextSelected(i)) { |
| 128 |
> |
sd = seleMan_.nextSelected(i)) { |
| 129 |
|
|
| 130 |
|
pos_.push_back(sd->getPos()); |
| 131 |
|
myIndex = sd->getGlobalIndex(); |
| 132 |
|
|
| 133 |
|
} |
| 134 |
+ |
*/ |
| 135 |
+ |
for (mol = info_->beginMolecule(mi); mol != NULL; |
| 136 |
+ |
mol = info_->nextMolecule(mi)) { |
| 137 |
+ |
for (atom = mol->beginAtom(ai); atom != NULL; |
| 138 |
+ |
atom = mol->nextAtom(ai)) { |
| 139 |
+ |
theAtoms_.push_back(atom); |
| 140 |
+ |
} |
| 141 |
+ |
} |
| 142 |
+ |
|
| 143 |
|
// Generate convex hull for this frame. |
| 144 |
< |
hull->genHull(pos_); |
| 144 |
> |
thishull->computeHull(theAtoms_); |
| 145 |
|
// totalVolume_ += hull->getVolume(); |
| 146 |
|
} |
| 147 |
|
//RealType avgVolume = totalVolume_/(RealType) frameCounter_; |
