ViewVC Help

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

root/OpenMD/trunk/src/applications/staticProps/GofRAngle.cpp

Comparing trunk/src/applications/staticProps/GofRAngle.cpp (file contents):
Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
Revision 1796 by gezelter, Mon Sep 10 18:38:44 2012 UTC

#	Line 6 | Line 6
6		* redistribute this software in source and binary code form, provided
7		* that the following conditions are met:
8		*
9	<	* 1. Acknowledgement of the program authors must be made in any
10	<	*    publication of scientific results based in part on use of the
11	<	*    program.  An acceptable form of acknowledgement is citation of
12	<	*    the article in which the program was described (Matthew
13	<	*    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14	<	*    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15	<	*    Parallel Simulation Engine for Molecular Dynamics,"
16	<	*    J. Comput. Chem. 26, pp. 252-271 (2005))
17	<	*
18	<	* 2. Redistributions of source code must retain the above copyright
9	>	* 1. Redistributions of source code must retain the above copyright
10		*    notice, this list of conditions and the following disclaimer.
11		*
12	<	* 3. Redistributions in binary form must reproduce the above copyright
12	>	* 2. Redistributions in binary form must reproduce the above copyright
13		*    notice, this list of conditions and the following disclaimer in the
14		*    documentation and/or other materials provided with the
15		*    distribution.
#	Line 37 | Line 28
28		* arising out of the use of or inability to use software, even if the
29		* University of Notre Dame has been advised of the possibility of
30		* such damages.
31	+	*
32	+	* SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
33	+	* research, please cite the appropriate papers when you publish your
34	+	* work.  Good starting points are:
35	+	*
36	+	* [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).
37	+	* [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).
38	+	* [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).
39	+	* [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40	+	* [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41		*/
42
43		#include <algorithm>
#	Line 44 | Line 45
45		#include "applications/staticProps/GofRAngle.hpp"
46		#include "utils/simError.h"
47
48	<	namespace oopse {
48	>	namespace OpenMD {
49
50		GofRAngle::GofRAngle(SimInfo* info, const std::string& filename, const std::string& sele1,
51	<	const std::string& sele2, double len, int nrbins, int nangleBins)
51	>	const std::string& sele2, RealType len, int nrbins, int nangleBins)
52		: RadialDistrFunc(info, filename, sele1, sele2), len_(len), nRBins_(nrbins), nAngleBins_(nangleBins){
53
54	<	deltaR_ = len_ /nRBins_;
55	<	deltaCosAngle_ = 2.0 / nAngleBins_;
55	<
54	>	deltaR_ = len_ /(double) nRBins_;
55	>	deltaCosAngle_ = 2.0 / (double)nAngleBins_;
56		histogram_.resize(nRBins_);
57		avgGofr_.resize(nRBins_);
58		for (int i = 0 ; i < nRBins_; ++i) {
#	Line 63 | Line 63 | namespace oopse {
63
64
65		void GofRAngle::preProcess() {
66	<
67	<	for (int i = 0; i < avgGofr_.size(); ++i) {
66	>	for (unsigned int i = 0; i < avgGofr_.size(); ++i) {
67		std::fill(avgGofr_[i].begin(), avgGofr_[i].end(), 0);
68		}
69		}
70
71	<	void GofRAngle::initalizeHistogram() {
71	>	void GofRAngle::initializeHistogram() {
72		npairs_ = 0;
73	<	for (int i = 0; i < histogram_.size(); ++i)
73	>	for (unsigned int i = 0; i < histogram_.size(); ++i){
74		std::fill(histogram_[i].begin(), histogram_[i].end(), 0);
75	+	}
76		}
77
78	–
78		void GofRAngle::processHistogram() {
80	–
79		int nPairs = getNPairs();
80	<	double volume = info_->getSnapshotManager()->getCurrentSnapshot()->getVolume();
81	<	double pairDensity = nPairs /volume;
82	<	double pairConstant = ( 4.0 * NumericConstant::PI * pairDensity ) / 3.0;
80	>	RealType volume = info_->getSnapshotManager()->getCurrentSnapshot()->getVolume();
81	>	RealType pairDensity = nPairs /volume;
82	>	RealType pairConstant = ( 4.0 * NumericConstant::PI * pairDensity ) / 3.0;
83
84	<	for(int i = 0 ; i < histogram_.size(); ++i){
84	>	for(unsigned int i = 0 ; i < histogram_.size(); ++i){
85
86	<	double rLower = i * deltaR_;
87	<	double rUpper = rLower + deltaR_;
88	<	double volSlice = ( rUpper * rUpper * rUpper ) - ( rLower * rLower * rLower );
89	<	double nIdeal = volSlice * pairConstant;
86	>	RealType rLower = i * deltaR_;
87	>	RealType rUpper = rLower + deltaR_;
88	>	RealType volSlice = ( rUpper * rUpper * rUpper ) - ( rLower * rLower * rLower );
89	>	RealType nIdeal = volSlice * pairConstant;
90
91	<	for (int j = 0; j < histogram_[i].size(); ++j){
91	>	for (unsigned int j = 0; j < histogram_[i].size(); ++j){
92		avgGofr_[i][j] += histogram_[i][j] / nIdeal;
93		}
94		}
#	Line 102 | Line 100 | namespace oopse {
100		if (sd1 == sd2) {
101		return;
102		}
105	–
103		Vector3d pos1 = sd1->getPos();
104		Vector3d pos2 = sd2->getPos();
105		Vector3d r12 = pos2 - pos1;
106	<	currentSnapshot_->wrapVector(r12);
106	>	if (usePeriodicBoundaryConditions_)
107	>	currentSnapshot_->wrapVector(r12);
108
109	<	double distance = r12.length();
110	<	int whichRBin = distance / deltaR_;
109	>	RealType distance = r12.length();
110	>	int whichRBin = int(distance / deltaR_);
111
112		if (distance <= len_) {
113	<	double cosAngle = evaluateAngle(sd1, sd2);
114	<	double halfBin = (nAngleBins_ - 1) * 0.5;
115	<	int whichThetaBin = halfBin * (cosAngle + 1.0);
113	>
114	>	RealType cosAngle = evaluateAngle(sd1, sd2);
115	>	RealType halfBin = (nAngleBins_ - 1) * 0.5;
116	>	int whichThetaBin = int(halfBin * (cosAngle + 1.0));
117		++histogram_[whichRBin][whichThetaBin];
118
119		++npairs_;
#	Line 129 | Line 128 | namespace oopse {
128		rdfStream << "selection2: (" << selectionScript2_ << ")\n";
129		rdfStream << "#nRBins = " << nRBins_ << "\t maxLen = " << len_ << "deltaR = " << deltaR_ <<"\n";
130		rdfStream << "#nAngleBins =" << nAngleBins_ << "deltaCosAngle = " << deltaCosAngle_ << "\n";
131	<	for (int i = 0; i < avgGofr_.size(); ++i) {
132	<	double r = deltaR_ * (i + 0.5);
131	>	for (unsigned int i = 0; i < avgGofr_.size(); ++i) {
132	>	// RealType r = deltaR_ * (i + 0.5);
133
134	<	for(int j = 0; j < avgGofr_[i].size(); ++j) {
135	<	double cosAngle = -1.0 + (j + 0.5)*deltaCosAngle_;
134	>	for(unsigned int j = 0; j < avgGofr_[i].size(); ++j) {
135	>	// RealType cosAngle = -1.0 + (j + 0.5)*deltaCosAngle_;
136		rdfStream << avgGofr_[i][j]/nProcessed_ << "\t";
137		}
138
#	Line 149 | Line 148 | namespace oopse {
148		rdfStream.close();
149		}
150
151	<	double GofRTheta::evaluateAngle(StuntDouble* sd1, StuntDouble* sd2) {
151	>	RealType GofRTheta::evaluateAngle(StuntDouble* sd1, StuntDouble* sd2) {
152		Vector3d pos1 = sd1->getPos();
153		Vector3d pos2 = sd2->getPos();
154		Vector3d r12 = pos2 - pos1;
155	<	currentSnapshot_->wrapVector(r12);
155	>
156	>	if (usePeriodicBoundaryConditions_)
157	>	currentSnapshot_->wrapVector(r12);
158	>
159		r12.normalize();
160		Vector3d dipole = sd1->getElectroFrame().getColumn(2);
161		dipole.normalize();
162		return dot(r12, dipole);
163		}
164
165	<	double GofROmega::evaluateAngle(StuntDouble* sd1, StuntDouble* sd2) {
165	>	RealType GofROmega::evaluateAngle(StuntDouble* sd1, StuntDouble* sd2) {
166		Vector3d v1 = sd1->getElectroFrame().getColumn(2);
167		Vector3d v2 = sd2->getElectroFrame().getColumn(2);
168		v1.normalize();

Comparing trunk/src/applications/staticProps/GofRAngle.cpp (property svn:keywords):
Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
Revision 1796 by gezelter, Mon Sep 10 18:38:44 2012 UTC

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

Diff Legend

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