ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/OpenMD/branches/development/src/selection/SelectionEvaluator.cpp

Comparing:
trunk/src/selection/SelectionEvaluator.cpp (file contents), Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
branches/development/src/selection/SelectionEvaluator.cpp (file contents), Revision 1629 by gezelter, Wed Sep 14 21:15:17 2011 UTC

#	Line 45 | Line 45
45		#include "primitives/DirectionalAtom.hpp"
46		#include "primitives/RigidBody.hpp"
47		#include "primitives/Molecule.hpp"
48	<	#include "io/basic_ifstrstream.hpp"
48	>	#include "io/ifstrstream.hpp"
49
50		namespace OpenMD {
51
52
53		SelectionEvaluator::SelectionEvaluator(SimInfo* si)
54	<	: info(si), nameFinder(info), distanceFinder(info), indexFinder(info),
54	>	: info(si), nameFinder(info), distanceFinder(info), hullFinder(info),
55	>	indexFinder(info),
56		isLoaded_(false){
57		nStuntDouble = info->getNGlobalAtoms() + info->getNGlobalRigidBodies();
58		}
#	Line 181 | Line 182 | namespace OpenMD {
182		case Token::within:
183		withinInstruction(instruction, stack.top());
184		break;
185	+	case Token::hull:
186	+	stack.push(hull());
187	+	break;
188		//case Token::selected:
189		//  stack.push(getSelectionSet());
190		//  break;
#	Line 274 | Line 278 | namespace OpenMD {
278		case Token::z:
279		propertyValue = sd->getPos().z();
280		break;
281	+	case Token::r:
282	+	propertyValue = sd->getPos().length();
283	+	break;
284		default:
285		unrecognizedAtomProperty(property);
286		}
#	Line 441 | Line 448 | namespace OpenMD {
448		}
449
450
451	+	OpenMDBitSet SelectionEvaluator::hull() {
452	+	OpenMDBitSet bs(nStuntDouble);
453	+
454	+	bs = hullFinder.findHull();
455	+
456	+	return bs;
457	+	}
458	+
459	+
460	+
461		RealType SelectionEvaluator::getCharge(Atom* atom) {
462		RealType charge =0.0;
463		AtomType* atomType = atom->getAtomType();

Comparing:
trunk/src/selection/SelectionEvaluator.cpp (property svn:keywords), Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
branches/development/src/selection/SelectionEvaluator.cpp (property svn:keywords), Revision 1629 by gezelter, Wed Sep 14 21:15:17 2011 UTC

#	Line 0 | Line 1
1	+	Author Id Revision Date

Diff Legend

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