--- trunk/src/applications/staticProps/NanoVolume.cpp 2007/09/17 20:11:47 1181 +++ trunk/src/applications/staticProps/NanoVolume.cpp 2007/12/06 20:04:02 1195 @@ -45,7 +45,7 @@ * * Created by Charles F. Vardeman II on 14 Dec 2006. * @author Charles F. Vardeman II - * @version $Id: NanoVolume.cpp,v 1.1 2007-09-17 20:11:47 chuckv Exp $ + * @version $Id: NanoVolume.cpp,v 1.4 2007-12-06 20:04:01 cpuglis Exp $ * */ @@ -62,16 +62,18 @@ NanoVolume::NanoVolume(SimInfo* info, const std::string& filename, const std::string& sele) : StaticAnalyser(info, filename), selectionScript_(sele), evaluator_(info), seleMan_(info) { - setOutputName(getPrefix(filename) + ".off"); + setOutputName(getPrefix(filename) + ".avol"); evaluator_.loadScriptString(sele); if (!evaluator_.isDynamic()) { seleMan_.setSelectionSet(evaluator_.evaluate()); } + frameCounter_ = 0; + totalVolume_ = 0.0; } void NanoVolume::process() { - +#if defined(HAVE_CGAL) Molecule* mol; Atom* atom; RigidBody* rb; @@ -124,8 +126,22 @@ void NanoVolume::process() { } // Generate convex hull for this frame. hull->genHull(pos_); - // RealType hullVolume = hull->getVolume(); - //std::cout <<"The volume for this hull is: "<< hullVolume << std::endl; - + totalVolume_ += hull->getVolume(); } + RealType avgVolume = totalVolume_/(RealType) frameCounter_; + //std::cout.precision(7); + //std::cout << avgVolume << std::endl; + + std::ofstream osq(getOutputFileName().c_str()); + osq.precision(7); + if (osq.is_open()){ + osq << avgVolume << std::endl; + + } + osq.close(); +#else + sprintf(painCave.errMsg, "NanoVolume: CGAL support was not compiled in!\n"); + painCave.isFatal = 1; + simError(); +#endif }