ViewVC Help

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

root/group/trunk/OOPSE-2.0/src/brains/SimInfo.cpp

Comparing trunk/OOPSE-2.0/src/brains/SimInfo.cpp (file contents):
Revision 1490 by gezelter, Fri Sep 24 04:16:43 2004 UTC vs.
Revision 2433 by chuckv, Tue Nov 15 16:05:38 2005 UTC

#	Line 1 | Line 1
1	<	#include <stdlib.h>
2	<	#include <string.h>
3	<	#include <math.h>
1	>	/*
2	>	* Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3	>	*
4	>	* The University of Notre Dame grants you ("Licensee") a
5	>	* non-exclusive, royalty free, license to use, modify and
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
19	>	*    notice, this list of conditions and the following disclaimer.
20	>	*
21	>	* 3. Redistributions in binary form must reproduce the above copyright
22	>	*    notice, this list of conditions and the following disclaimer in the
23	>	*    documentation and/or other materials provided with the
24	>	*    distribution.
25	>	*
26	>	* This software is provided "AS IS," without a warranty of any
27	>	* kind. All express or implied conditions, representations and
28	>	* warranties, including any implied warranty of merchantability,
29	>	* fitness for a particular purpose or non-infringement, are hereby
30	>	* excluded.  The University of Notre Dame and its licensors shall not
31	>	* be liable for any damages suffered by licensee as a result of
32	>	* using, modifying or distributing the software or its
33	>	* derivatives. In no event will the University of Notre Dame or its
34	>	* licensors be liable for any lost revenue, profit or data, or for
35	>	* direct, indirect, special, consequential, incidental or punitive
36	>	* damages, however caused and regardless of the theory of liability,
37	>	* arising out of the use of or inability to use software, even if the
38	>	* University of Notre Dame has been advised of the possibility of
39	>	* such damages.
40	>	*/
41	>
42	>	/**
43	>	* @file SimInfo.cpp
44	>	* @author    tlin
45	>	* @date  11/02/2004
46	>	* @version 1.0
47	>	*/
48
49	<	#include <iostream>
50	<	using namespace std;
49	>	#include <algorithm>
50	>	#include <set>
51
52	<	#include "SimInfo.hpp"
53	<	#define __C
54	<	#include "fSimulation.h"
55	<	#include "simError.h"
52	>	#include "brains/SimInfo.hpp"
53	>	#include "math/Vector3.hpp"
54	>	#include "primitives/Molecule.hpp"
55	>	#include "UseTheForce/fCutoffPolicy.h"
56	>	#include "UseTheForce/DarkSide/fElectrostaticSummationMethod.h"
57	>	#include "UseTheForce/DarkSide/fElectrostaticScreeningMethod.h"
58	>	#include "UseTheForce/DarkSide/fSwitchingFunctionType.h"
59	>	#include "UseTheForce/doForces_interface.h"
60	>	#include "UseTheForce/DarkSide/electrostatic_interface.h"
61	>	#include "UseTheForce/notifyCutoffs_interface.h"
62	>	#include "UseTheForce/DarkSide/switcheroo_interface.h"
63	>	#include "utils/MemoryUtils.hpp"
64	>	#include "utils/simError.h"
65	>	#include "selection/SelectionManager.hpp"
66
13	–	#include "fortranWrappers.hpp"
14	–
15	–	#include "MatVec3.h"
16	–
67		#ifdef IS_MPI
68	<	#include "mpiSimulation.hpp"
69	<	#endif
68	>	#include "UseTheForce/mpiComponentPlan.h"
69	>	#include "UseTheForce/DarkSide/simParallel_interface.h"
70	>	#endif
71
72	<	inline double roundMe( double x ){
22	<	return ( x >= 0 ) ? floor( x + 0.5 ) : ceil( x - 0.5 );
23	<	}
24	<
25	<	inline double min( double a, double b ){
26	<	return (a < b ) ? a : b;
27	<	}
72	>	namespace oopse {
73
74	<	SimInfo* currentInfo;
74	>	SimInfo::SimInfo(MakeStamps* stamps, std::vector<std::pair<MoleculeStamp*, int> >& molStampPairs,
75	>	ForceField* ff, Globals* simParams) :
76	>	stamps_(stamps), forceField_(ff), simParams_(simParams),
77	>	ndf_(0), ndfRaw_(0), ndfTrans_(0), nZconstraint_(0),
78	>	nGlobalMols_(0), nGlobalAtoms_(0), nGlobalCutoffGroups_(0),
79	>	nGlobalIntegrableObjects_(0), nGlobalRigidBodies_(0),
80	>	nAtoms_(0), nBonds_(0),  nBends_(0), nTorsions_(0), nRigidBodies_(0),
81	>	nIntegrableObjects_(0),  nCutoffGroups_(0), nConstraints_(0),
82	>	sman_(NULL), fortranInitialized_(false) {
83
84	<	SimInfo::SimInfo(){
84	>
85	>	std::vector<std::pair<MoleculeStamp*, int> >::iterator i;
86	>	MoleculeStamp* molStamp;
87	>	int nMolWithSameStamp;
88	>	int nCutoffAtoms = 0; // number of atoms belong to cutoff groups
89	>	int nGroups = 0;      //total cutoff groups defined in meta-data file
90	>	CutoffGroupStamp* cgStamp;
91	>	RigidBodyStamp* rbStamp;
92	>	int nRigidAtoms = 0;
93	>
94	>	for (i = molStampPairs.begin(); i !=molStampPairs.end(); ++i) {
95	>	molStamp = i->first;
96	>	nMolWithSameStamp = i->second;
97	>
98	>	addMoleculeStamp(molStamp, nMolWithSameStamp);
99
100	<	n_constraints = 0;
101	<	nZconstraints = 0;
35	<	n_oriented = 0;
36	<	n_dipoles = 0;
37	<	ndf = 0;
38	<	ndfRaw = 0;
39	<	nZconstraints = 0;
40	<	the_integrator = NULL;
41	<	setTemp = 0;
42	<	thermalTime = 0.0;
43	<	currentTime = 0.0;
44	<	rCut = 0.0;
45	<	rSw = 0.0;
100	>	//calculate atoms in molecules
101	>	nGlobalAtoms_ += molStamp->getNAtoms() *nMolWithSameStamp;
102
47	–	haveRcut = 0;
48	–	haveRsw = 0;
49	–	boxIsInit = 0;
50	–
51	–	resetTime = 1e99;
103
104	<	orthoRhombic = 0;
105	<	orthoTolerance = 1E-6;
106	<	useInitXSstate = true;
104	>	//calculate atoms in cutoff groups
105	>	int nAtomsInGroups = 0;
106	>	int nCutoffGroupsInStamp = molStamp->getNCutoffGroups();
107	>
108	>	for (int j=0; j < nCutoffGroupsInStamp; j++) {
109	>	cgStamp = molStamp->getCutoffGroup(j);
110	>	nAtomsInGroups += cgStamp->getNMembers();
111	>	}
112
113	<	usePBC = 0;
58	<	useLJ = 0;
59	<	useSticky = 0;
60	<	useCharges = 0;
61	<	useDipoles = 0;
62	<	useReactionField = 0;
63	<	useGB = 0;
64	<	useEAM = 0;
65	<	useSolidThermInt = 0;
66	<	useLiquidThermInt = 0;
113	>	nGroups += nCutoffGroupsInStamp * nMolWithSameStamp;
114
115	<	haveCutoffGroups = false;
115	>	nCutoffAtoms += nAtomsInGroups * nMolWithSameStamp;
116
117	<	excludes = Exclude::Instance();
117	>	//calculate atoms in rigid bodies
118	>	int nAtomsInRigidBodies = 0;
119	>	int nRigidBodiesInStamp = molStamp->getNRigidBodies();
120	>
121	>	for (int j=0; j < nRigidBodiesInStamp; j++) {
122	>	rbStamp = molStamp->getRigidBody(j);
123	>	nAtomsInRigidBodies += rbStamp->getNMembers();
124	>	}
125
126	<	myConfiguration = new SimState();
126	>	nGlobalRigidBodies_ += nRigidBodiesInStamp * nMolWithSameStamp;
127	>	nRigidAtoms += nAtomsInRigidBodies * nMolWithSameStamp;
128	>
129	>	}
130
131	<	has_minimizer = false;
132	<	the_minimizer =NULL;
131	>	//every free atom (atom does not belong to cutoff groups) is a cutoff
132	>	//group therefore the total number of cutoff groups in the system is
133	>	//equal to the total number of atoms minus number of atoms belong to
134	>	//cutoff group defined in meta-data file plus the number of cutoff
135	>	//groups defined in meta-data file
136	>	nGlobalCutoffGroups_ = nGlobalAtoms_ - nCutoffAtoms + nGroups;
137
138	<	ngroup = 0;
138	>	//every free atom (atom does not belong to rigid bodies) is an
139	>	//integrable object therefore the total number of integrable objects
140	>	//in the system is equal to the total number of atoms minus number of
141	>	//atoms belong to rigid body defined in meta-data file plus the number
142	>	//of rigid bodies defined in meta-data file
143	>	nGlobalIntegrableObjects_ = nGlobalAtoms_ - nRigidAtoms
144	>	+ nGlobalRigidBodies_;
145	>
146	>	nGlobalMols_ = molStampIds_.size();
147
148	<	wrapMeSimInfo( this );
149	<	}
148	>	#ifdef IS_MPI
149	>	molToProcMap_.resize(nGlobalMols_);
150	>	#endif
151
152	+	}
153
154	<	SimInfo::~SimInfo(){
154	>	SimInfo::~SimInfo() {
155	>	std::map<int, Molecule*>::iterator i;
156	>	for (i = molecules_.begin(); i != molecules_.end(); ++i) {
157	>	delete i->second;
158	>	}
159	>	molecules_.clear();
160	>
161	>	delete stamps_;
162	>	delete sman_;
163	>	delete simParams_;
164	>	delete forceField_;
165	>	}
166
167	<	delete myConfiguration;
167	>	int SimInfo::getNGlobalConstraints() {
168	>	int nGlobalConstraints;
169	>	#ifdef IS_MPI
170	>	MPI_Allreduce(&nConstraints_, &nGlobalConstraints, 1, MPI_INT, MPI_SUM,
171	>	MPI_COMM_WORLD);
172	>	#else
173	>	nGlobalConstraints =  nConstraints_;
174	>	#endif
175	>	return nGlobalConstraints;
176	>	}
177
178	<	map<string, GenericData*>::iterator i;
179	<
89	<	for(i = properties.begin(); i != properties.end(); i++)
90	<	delete (*i).second;
178	>	bool SimInfo::addMolecule(Molecule* mol) {
179	>	MoleculeIterator i;
180
181	<	}
181	>	i = molecules_.find(mol->getGlobalIndex());
182	>	if (i == molecules_.end() ) {
183
184	<	void SimInfo::setBox(double newBox[3]) {
185	<
186	<	int i, j;
187	<	double tempMat[3][3];
184	>	molecules_.insert(std::make_pair(mol->getGlobalIndex(), mol));
185	>
186	>	nAtoms_ += mol->getNAtoms();
187	>	nBonds_ += mol->getNBonds();
188	>	nBends_ += mol->getNBends();
189	>	nTorsions_ += mol->getNTorsions();
190	>	nRigidBodies_ += mol->getNRigidBodies();
191	>	nIntegrableObjects_ += mol->getNIntegrableObjects();
192	>	nCutoffGroups_ += mol->getNCutoffGroups();
193	>	nConstraints_ += mol->getNConstraintPairs();
194
195	<	for(i=0; i<3; i++)
196	<	for (j=0; j<3; j++) tempMat[i][j] = 0.0;;
197	<
198	<	tempMat[0][0] = newBox[0];
199	<	tempMat[1][1] = newBox[1];
104	<	tempMat[2][2] = newBox[2];
105	<
106	<	setBoxM( tempMat );
107	<
108	<	}
109	<
110	<	void SimInfo::setBoxM( double theBox[3][3] ){
111	<
112	<	int i, j;
113	<	double FortranHmat[9]; // to preserve compatibility with Fortran the
114	<	// ordering in the array is as follows:
115	<	// [ 0 3 6 ]
116	<	// [ 1 4 7 ]
117	<	// [ 2 5 8 ]
118	<	double FortranHmatInv[9]; // the inverted Hmat (for Fortran);
119	<
120	<	if( !boxIsInit ) boxIsInit = 1;
121	<
122	<	for(i=0; i < 3; i++)
123	<	for (j=0; j < 3; j++) Hmat[i][j] = theBox[i][j];
124	<
125	<	calcBoxL();
126	<	calcHmatInv();
127	<
128	<	for(i=0; i < 3; i++) {
129	<	for (j=0; j < 3; j++) {
130	<	FortranHmat[3*j + i] = Hmat[i][j];
131	<	FortranHmatInv[3*j + i] = HmatInv[i][j];
195	>	addExcludePairs(mol);
196	>
197	>	return true;
198	>	} else {
199	>	return false;
200		}
201		}
202
203	<	setFortranBoxSize(FortranHmat, FortranHmatInv, &orthoRhombic);
204	<
205	<	}
138	<
203	>	bool SimInfo::removeMolecule(Molecule* mol) {
204	>	MoleculeIterator i;
205	>	i = molecules_.find(mol->getGlobalIndex());
206
207	<	void SimInfo::getBoxM (double theBox[3][3]) {
207	>	if (i != molecules_.end() ) {
208
209	<	int i, j;
210	<	for(i=0; i<3; i++)
211	<	for (j=0; j<3; j++) theBox[i][j] = Hmat[i][j];
212	<	}
209	>	assert(mol == i->second);
210	>
211	>	nAtoms_ -= mol->getNAtoms();
212	>	nBonds_ -= mol->getNBonds();
213	>	nBends_ -= mol->getNBends();
214	>	nTorsions_ -= mol->getNTorsions();
215	>	nRigidBodies_ -= mol->getNRigidBodies();
216	>	nIntegrableObjects_ -= mol->getNIntegrableObjects();
217	>	nCutoffGroups_ -= mol->getNCutoffGroups();
218	>	nConstraints_ -= mol->getNConstraintPairs();
219
220	+	removeExcludePairs(mol);
221	+	molecules_.erase(mol->getGlobalIndex());
222
223	<	void SimInfo::scaleBox(double scale) {
224	<	double theBox[3][3];
225	<	int i, j;
223	>	delete mol;
224	>
225	>	return true;
226	>	} else {
227	>	return false;
228	>	}
229
152	–	// cerr << "Scaling box by " << scale << "\n";
230
231	<	for(i=0; i<3; i++)
155	<	for (j=0; j<3; j++) theBox[i][j] = Hmat[i][j]*scale;
231	>	}
232
233	<	setBoxM(theBox);
233	>
234	>	Molecule* SimInfo::beginMolecule(MoleculeIterator& i) {
235	>	i = molecules_.begin();
236	>	return i == molecules_.end() ? NULL : i->second;
237	>	}
238
239	<	}
239	>	Molecule* SimInfo::nextMolecule(MoleculeIterator& i) {
240	>	++i;
241	>	return i == molecules_.end() ? NULL : i->second;
242	>	}
243
161	–	void SimInfo::calcHmatInv( void ) {
162	–
163	–	int oldOrtho;
164	–	int i,j;
165	–	double smallDiag;
166	–	double tol;
167	–	double sanity[3][3];
244
245	<	invertMat3( Hmat, HmatInv );
245	>	void SimInfo::calcNdf() {
246	>	int ndf_local;
247	>	MoleculeIterator i;
248	>	std::vector<StuntDouble*>::iterator j;
249	>	Molecule* mol;
250	>	StuntDouble* integrableObject;
251
252	<	// check to see if Hmat is orthorhombic
253	<
254	<	oldOrtho = orthoRhombic;
252	>	ndf_local = 0;
253	>
254	>	for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
255	>	for (integrableObject = mol->beginIntegrableObject(j); integrableObject != NULL;
256	>	integrableObject = mol->nextIntegrableObject(j)) {
257
258	<	smallDiag = fabs(Hmat[0][0]);
176	<	if(smallDiag > fabs(Hmat[1][1])) smallDiag = fabs(Hmat[1][1]);
177	<	if(smallDiag > fabs(Hmat[2][2])) smallDiag = fabs(Hmat[2][2]);
178	<	tol = smallDiag * orthoTolerance;
258	>	ndf_local += 3;
259
260	<	orthoRhombic = 1;
261	<
262	<	for (i = 0; i < 3; i++ ) {
263	<	for (j = 0 ; j < 3; j++) {
264	<	if (i != j) {
265	<	if (orthoRhombic) {
266	<	if ( fabs(Hmat[i][j]) >= tol) orthoRhombic = 0;
267	<	}
268	<	}
269	<	}
190	<	}
191	<
192	<	if( oldOrtho != orthoRhombic ){
260	>	if (integrableObject->isDirectional()) {
261	>	if (integrableObject->isLinear()) {
262	>	ndf_local += 2;
263	>	} else {
264	>	ndf_local += 3;
265	>	}
266	>	}
267	>
268	>	}//end for (integrableObject)
269	>	}// end for (mol)
270
271	<	if( orthoRhombic ) {
272	<	sprintf( painCave.errMsg,
196	<	"OOPSE is switching from the default Non-Orthorhombic\n"
197	<	"\tto the faster Orthorhombic periodic boundary computations.\n"
198	<	"\tThis is usually a good thing, but if you wan't the\n"
199	<	"\tNon-Orthorhombic computations, make the orthoBoxTolerance\n"
200	<	"\tvariable ( currently set to %G ) smaller.\n",
201	<	orthoTolerance);
202	<	painCave.severity = OOPSE_INFO;
203	<	simError();
204	<	}
205	<	else {
206	<	sprintf( painCave.errMsg,
207	<	"OOPSE is switching from the faster Orthorhombic to the more\n"
208	<	"\tflexible Non-Orthorhombic periodic boundary computations.\n"
209	<	"\tThis is usually because the box has deformed under\n"
210	<	"\tNPTf integration. If you wan't to live on the edge with\n"
211	<	"\tthe Orthorhombic computations, make the orthoBoxTolerance\n"
212	<	"\tvariable ( currently set to %G ) larger.\n",
213	<	orthoTolerance);
214	<	painCave.severity = OOPSE_WARNING;
215	<	simError();
216	<	}
217	<	}
218	<	}
271	>	// n_constraints is local, so subtract them on each processor
272	>	ndf_local -= nConstraints_;
273
274	<	void SimInfo::calcBoxL( void ){
274	>	#ifdef IS_MPI
275	>	MPI_Allreduce(&ndf_local,&ndf_,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
276	>	#else
277	>	ndf_ = ndf_local;
278	>	#endif
279
280	<	double dx, dy, dz, dsq;
280	>	// nZconstraints_ is global, as are the 3 COM translations for the
281	>	// entire system:
282	>	ndf_ = ndf_ - 3 - nZconstraint_;
283
284	<	// boxVol = Determinant of Hmat
284	>	}
285
286	<	boxVol = matDet3( Hmat );
286	>	void SimInfo::calcNdfRaw() {
287	>	int ndfRaw_local;
288
289	<	// boxLx
290	<
291	<	dx = Hmat[0][0]; dy = Hmat[1][0]; dz = Hmat[2][0];
292	<	dsq = dx*dx + dy*dy + dz*dz;
232	<	boxL[0] = sqrt( dsq );
233	<	//maxCutoff = 0.5 * boxL[0];
289	>	MoleculeIterator i;
290	>	std::vector<StuntDouble*>::iterator j;
291	>	Molecule* mol;
292	>	StuntDouble* integrableObject;
293
294	<	// boxLy
295	<
296	<	dx = Hmat[0][1]; dy = Hmat[1][1]; dz = Hmat[2][1];
297	<	dsq = dx*dx + dy*dy + dz*dz;
298	<	boxL[1] = sqrt( dsq );
299	<	//if( (0.5 * boxL[1]) < maxCutoff ) maxCutoff = 0.5 * boxL[1];
241	<
242	<
243	<	// boxLz
244	<
245	<	dx = Hmat[0][2]; dy = Hmat[1][2]; dz = Hmat[2][2];
246	<	dsq = dx*dx + dy*dy + dz*dz;
247	<	boxL[2] = sqrt( dsq );
248	<	//if( (0.5 * boxL[2]) < maxCutoff ) maxCutoff = 0.5 * boxL[2];
249	<
250	<	//calculate the max cutoff
251	<	maxCutoff =  calcMaxCutOff();
252	<
253	<	checkCutOffs();
254	<
255	<	}
294	>	// Raw degrees of freedom that we have to set
295	>	ndfRaw_local = 0;
296	>
297	>	for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
298	>	for (integrableObject = mol->beginIntegrableObject(j); integrableObject != NULL;
299	>	integrableObject = mol->nextIntegrableObject(j)) {
300
301	+	ndfRaw_local += 3;
302
303	<	double SimInfo::calcMaxCutOff(){
303	>	if (integrableObject->isDirectional()) {
304	>	if (integrableObject->isLinear()) {
305	>	ndfRaw_local += 2;
306	>	} else {
307	>	ndfRaw_local += 3;
308	>	}
309	>	}
310	>
311	>	}
312	>	}
313	>
314	>	#ifdef IS_MPI
315	>	MPI_Allreduce(&ndfRaw_local,&ndfRaw_,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
316	>	#else
317	>	ndfRaw_ = ndfRaw_local;
318	>	#endif
319	>	}
320
321	<	double ri[3], rj[3], rk[3];
322	<	double rij[3], rjk[3], rki[3];
262	<	double minDist;
321	>	void SimInfo::calcNdfTrans() {
322	>	int ndfTrans_local;
323
324	<	ri[0] = Hmat[0][0];
265	<	ri[1] = Hmat[1][0];
266	<	ri[2] = Hmat[2][0];
324	>	ndfTrans_local = 3 * nIntegrableObjects_ - nConstraints_;
325
268	–	rj[0] = Hmat[0][1];
269	–	rj[1] = Hmat[1][1];
270	–	rj[2] = Hmat[2][1];
326
327	<	rk[0] = Hmat[0][2];
328	<	rk[1] = Hmat[1][2];
329	<	rk[2] = Hmat[2][2];
330	<
331	<	crossProduct3(ri, rj, rij);
277	<	distXY = dotProduct3(rk,rij) / norm3(rij);
327	>	#ifdef IS_MPI
328	>	MPI_Allreduce(&ndfTrans_local,&ndfTrans_,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
329	>	#else
330	>	ndfTrans_ = ndfTrans_local;
331	>	#endif
332
333	<	crossProduct3(rj,rk, rjk);
334	<	distYZ = dotProduct3(ri,rjk) / norm3(rjk);
333	>	ndfTrans_ = ndfTrans_ - 3 - nZconstraint_;
334	>
335	>	}
336
337	<	crossProduct3(rk,ri, rki);
338	<	distZX = dotProduct3(rj,rki) / norm3(rki);
337	>	void SimInfo::addExcludePairs(Molecule* mol) {
338	>	std::vector<Bond*>::iterator bondIter;
339	>	std::vector<Bend*>::iterator bendIter;
340	>	std::vector<Torsion*>::iterator torsionIter;
341	>	Bond* bond;
342	>	Bend* bend;
343	>	Torsion* torsion;
344	>	int a;
345	>	int b;
346	>	int c;
347	>	int d;
348	>
349	>	for (bond= mol->beginBond(bondIter); bond != NULL; bond = mol->nextBond(bondIter)) {
350	>	a = bond->getAtomA()->getGlobalIndex();
351	>	b = bond->getAtomB()->getGlobalIndex();
352	>	exclude_.addPair(a, b);
353	>	}
354
355	<	minDist = min(min(distXY, distYZ), distZX);
356	<	return minDist/2;
357	<
358	<	}
355	>	for (bend= mol->beginBend(bendIter); bend != NULL; bend = mol->nextBend(bendIter)) {
356	>	a = bend->getAtomA()->getGlobalIndex();
357	>	b = bend->getAtomB()->getGlobalIndex();
358	>	c = bend->getAtomC()->getGlobalIndex();
359
360	<	void SimInfo::wrapVector( double thePos[3] ){
360	>	exclude_.addPair(a, b);
361	>	exclude_.addPair(a, c);
362	>	exclude_.addPair(b, c);
363	>	}
364
365	<	int i;
366	<	double scaled[3];
365	>	for (torsion= mol->beginTorsion(torsionIter); torsion != NULL; torsion = mol->nextTorsion(torsionIter)) {
366	>	a = torsion->getAtomA()->getGlobalIndex();
367	>	b = torsion->getAtomB()->getGlobalIndex();
368	>	c = torsion->getAtomC()->getGlobalIndex();
369	>	d = torsion->getAtomD()->getGlobalIndex();
370
371	<	if( !orthoRhombic ){
372	<	// calc the scaled coordinates.
373	<
371	>	exclude_.addPair(a, b);
372	>	exclude_.addPair(a, c);
373	>	exclude_.addPair(a, d);
374	>	exclude_.addPair(b, c);
375	>	exclude_.addPair(b, d);
376	>	exclude_.addPair(c, d);
377	>	}
378
379	<	matVecMul3(HmatInv, thePos, scaled);
380	<
381	<	for(i=0; i<3; i++)
382	<	scaled[i] -= roundMe(scaled[i]);
383	<
384	<	// calc the wrapped real coordinates from the wrapped scaled coordinates
385	<
386	<	matVecMul3(Hmat, scaled, thePos);
379	>	Molecule::RigidBodyIterator rbIter;
380	>	RigidBody* rb;
381	>	for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
382	>	std::vector<Atom*> atoms = rb->getAtoms();
383	>	for (int i = 0; i < atoms.size() -1 ; ++i) {
384	>	for (int j = i + 1; j < atoms.size(); ++j) {
385	>	a = atoms[i]->getGlobalIndex();
386	>	b = atoms[j]->getGlobalIndex();
387	>	exclude_.addPair(a, b);
388	>	}
389	>	}
390	>	}
391
392		}
393	<	else{
394	<	// calc the scaled coordinates.
393	>
394	>	void SimInfo::removeExcludePairs(Molecule* mol) {
395	>	std::vector<Bond*>::iterator bondIter;
396	>	std::vector<Bend*>::iterator bendIter;
397	>	std::vector<Torsion*>::iterator torsionIter;
398	>	Bond* bond;
399	>	Bend* bend;
400	>	Torsion* torsion;
401	>	int a;
402	>	int b;
403	>	int c;
404	>	int d;
405
406	<	for(i=0; i<3; i++)
407	<	scaled[i] = thePos[i]*HmatInv[i][i];
408	<
409	<	// wrap the scaled coordinates
410	<
317	<	for(i=0; i<3; i++)
318	<	scaled[i] -= roundMe(scaled[i]);
319	<
320	<	// calc the wrapped real coordinates from the wrapped scaled coordinates
321	<
322	<	for(i=0; i<3; i++)
323	<	thePos[i] = scaled[i]*Hmat[i][i];
324	<	}
325	<
326	<	}
406	>	for (bond= mol->beginBond(bondIter); bond != NULL; bond = mol->nextBond(bondIter)) {
407	>	a = bond->getAtomA()->getGlobalIndex();
408	>	b = bond->getAtomB()->getGlobalIndex();
409	>	exclude_.removePair(a, b);
410	>	}
411
412	+	for (bend= mol->beginBend(bendIter); bend != NULL; bend = mol->nextBend(bendIter)) {
413	+	a = bend->getAtomA()->getGlobalIndex();
414	+	b = bend->getAtomB()->getGlobalIndex();
415	+	c = bend->getAtomC()->getGlobalIndex();
416
417	<	int SimInfo::getNDF(){
418	<	int ndf_local;
417	>	exclude_.removePair(a, b);
418	>	exclude_.removePair(a, c);
419	>	exclude_.removePair(b, c);
420	>	}
421
422	<	ndf_local = 0;
423	<
424	<	for(int i = 0; i < integrableObjects.size(); i++){
425	<	ndf_local += 3;
426	<	if (integrableObjects[i]->isDirectional()) {
427	<	if (integrableObjects[i]->isLinear())
428	<	ndf_local += 2;
429	<	else
430	<	ndf_local += 3;
422	>	for (torsion= mol->beginTorsion(torsionIter); torsion != NULL; torsion = mol->nextTorsion(torsionIter)) {
423	>	a = torsion->getAtomA()->getGlobalIndex();
424	>	b = torsion->getAtomB()->getGlobalIndex();
425	>	c = torsion->getAtomC()->getGlobalIndex();
426	>	d = torsion->getAtomD()->getGlobalIndex();
427	>
428	>	exclude_.removePair(a, b);
429	>	exclude_.removePair(a, c);
430	>	exclude_.removePair(a, d);
431	>	exclude_.removePair(b, c);
432	>	exclude_.removePair(b, d);
433	>	exclude_.removePair(c, d);
434		}
435	+
436	+	Molecule::RigidBodyIterator rbIter;
437	+	RigidBody* rb;
438	+	for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
439	+	std::vector<Atom*> atoms = rb->getAtoms();
440	+	for (int i = 0; i < atoms.size() -1 ; ++i) {
441	+	for (int j = i + 1; j < atoms.size(); ++j) {
442	+	a = atoms[i]->getGlobalIndex();
443	+	b = atoms[j]->getGlobalIndex();
444	+	exclude_.removePair(a, b);
445	+	}
446	+	}
447	+	}
448	+
449		}
450
344	–	// n_constraints is local, so subtract them on each processor:
451
452	<	ndf_local -= n_constraints;
452	>	void SimInfo::addMoleculeStamp(MoleculeStamp* molStamp, int nmol) {
453	>	int curStampId;
454
455	+	//index from 0
456	+	curStampId = moleculeStamps_.size();
457	+
458	+	moleculeStamps_.push_back(molStamp);
459	+	molStampIds_.insert(molStampIds_.end(), nmol, curStampId);
460	+	}
461	+
462	+	void SimInfo::update() {
463	+
464	+	setupSimType();
465	+
466		#ifdef IS_MPI
467	<	MPI_Allreduce(&ndf_local,&ndf,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
350	<	#else
351	<	ndf = ndf_local;
467	>	setupFortranParallel();
468		#endif
469
470	<	// nZconstraints is global, as are the 3 COM translations for the
355	<	// entire system:
470	>	setupFortranSim();
471
472	<	ndf = ndf - 3 - nZconstraints;
472	>	//setup fortran force field
473	>	/** @deprecate */
474	>	int isError = 0;
475	>
476	>	setupElectrostaticSummationMethod( isError );
477	>	setupSwitchingFunction();
478
479	<	return ndf;
480	<	}
479	>	if(isError){
480	>	sprintf( painCave.errMsg,
481	>	"ForceField error: There was an error initializing the forceField in fortran.\n" );
482	>	painCave.isFatal = 1;
483	>	simError();
484	>	}
485	>
486	>
487	>	setupCutoff();
488
489	<	int SimInfo::getNDFraw() {
490	<	int ndfRaw_local;
489	>	calcNdf();
490	>	calcNdfRaw();
491	>	calcNdfTrans();
492
493	<	// Raw degrees of freedom that we have to set
494	<	ndfRaw_local = 0;
493	>	fortranInitialized_ = true;
494	>	}
495
496	<	for(int i = 0; i < integrableObjects.size(); i++){
497	<	ndfRaw_local += 3;
498	<	if (integrableObjects[i]->isDirectional()) {
499	<	if (integrableObjects[i]->isLinear())
500	<	ndfRaw_local += 2;
501	<	else
502	<	ndfRaw_local += 3;
496	>	std::set<AtomType*> SimInfo::getUniqueAtomTypes() {
497	>	SimInfo::MoleculeIterator mi;
498	>	Molecule* mol;
499	>	Molecule::AtomIterator ai;
500	>	Atom* atom;
501	>	std::set<AtomType*> atomTypes;
502	>
503	>	for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
504	>
505	>	for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
506	>	atomTypes.insert(atom->getAtomType());
507	>	}
508	>
509		}
510	+
511	+	return atomTypes;
512		}
513	+
514	+	void SimInfo::setupSimType() {
515	+	std::set<AtomType*>::iterator i;
516	+	std::set<AtomType*> atomTypes;
517	+	atomTypes = getUniqueAtomTypes();
518
519	<	#ifdef IS_MPI
520	<	MPI_Allreduce(&ndfRaw_local,&ndfRaw,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
521	<	#else
522	<	ndfRaw = ndfRaw_local;
523	<	#endif
519	>	int useLennardJones = 0;
520	>	int useElectrostatic = 0;
521	>	int useEAM = 0;
522	>	int useSC = 0;
523	>	int useCharge = 0;
524	>	int useDirectional = 0;
525	>	int useDipole = 0;
526	>	int useGayBerne = 0;
527	>	int useSticky = 0;
528	>	int useStickyPower = 0;
529	>	int useShape = 0;
530	>	int useFLARB = 0; //it is not in AtomType yet
531	>	int useDirectionalAtom = 0;
532	>	int useElectrostatics = 0;
533	>	//usePBC and useRF are from simParams
534	>	int usePBC = simParams_->getUsePeriodicBoundaryConditions();
535	>	int useRF;
536	>	int useSF;
537	>	std::string myMethod;
538
539	<	return ndfRaw;
540	<	}
539	>	// set the useRF logical
540	>	useRF = 0;
541	>	useSF = 0;
542
387	–	int SimInfo::getNDFtranslational() {
388	–	int ndfTrans_local;
543
544	<	ndfTrans_local = 3 * integrableObjects.size() - n_constraints;
544	>	if (simParams_->haveElectrostaticSummationMethod()) {
545	>	std::string myMethod = simParams_->getElectrostaticSummationMethod();
546	>	toUpper(myMethod);
547	>	if (myMethod == "REACTION_FIELD") {
548	>	useRF=1;
549	>	} else {
550	>	if (myMethod == "SHIFTED_FORCE") {
551	>	useSF = 1;
552	>	}
553	>	}
554	>	}
555
556	+	//loop over all of the atom types
557	+	for (i = atomTypes.begin(); i != atomTypes.end(); ++i) {
558	+	useLennardJones |= (*i)->isLennardJones();
559	+	useElectrostatic |= (*i)->isElectrostatic();
560	+	useEAM |= (*i)->isEAM();
561	+	useSC |= (*i)->isSC();
562	+	useCharge |= (*i)->isCharge();
563	+	useDirectional |= (*i)->isDirectional();
564	+	useDipole |= (*i)->isDipole();
565	+	useGayBerne |= (*i)->isGayBerne();
566	+	useSticky |= (*i)->isSticky();
567	+	useStickyPower |= (*i)->isStickyPower();
568	+	useShape |= (*i)->isShape();
569	+	}
570
571	<	#ifdef IS_MPI
572	<	MPI_Allreduce(&ndfTrans_local,&ndfTrans,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
573	<	#else
396	<	ndfTrans = ndfTrans_local;
397	<	#endif
571	>	if (useSticky || useStickyPower || useDipole || useGayBerne || useShape) {
572	>	useDirectionalAtom = 1;
573	>	}
574
575	<	ndfTrans = ndfTrans - 3 - nZconstraints;
575	>	if (useCharge || useDipole) {
576	>	useElectrostatics = 1;
577	>	}
578
579	<	return ndfTrans;
580	<	}
579	>	#ifdef IS_MPI
580	>	int temp;
581
582	<	int SimInfo::getTotIntegrableObjects() {
583	<	int nObjs_local;
406	<	int nObjs;
582	>	temp = usePBC;
583	>	MPI_Allreduce(&temp, &usePBC, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
584
585	<	nObjs_local =  integrableObjects.size();
585	>	temp = useDirectionalAtom;
586	>	MPI_Allreduce(&temp, &useDirectionalAtom, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
587
588	+	temp = useLennardJones;
589	+	MPI_Allreduce(&temp, &useLennardJones, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
590
591	<	#ifdef IS_MPI
592	<	MPI_Allreduce(&nObjs_local,&nObjs,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
413	<	#else
414	<	nObjs = nObjs_local;
415	<	#endif
591	>	temp = useElectrostatics;
592	>	MPI_Allreduce(&temp, &useElectrostatics, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
593
594	+	temp = useCharge;
595	+	MPI_Allreduce(&temp, &useCharge, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
596
597	<	return nObjs;
598	<	}
597	>	temp = useDipole;
598	>	MPI_Allreduce(&temp, &useDipole, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
599
600	<	void SimInfo::refreshSim(){
600	>	temp = useSticky;
601	>	MPI_Allreduce(&temp, &useSticky, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
602
603	<	simtype fInfo;
604	<	int isError;
605	<	int n_global;
606	<	int* excl;
603	>	temp = useStickyPower;
604	>	MPI_Allreduce(&temp, &useStickyPower, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
605	>
606	>	temp = useGayBerne;
607	>	MPI_Allreduce(&temp, &useGayBerne, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
608
609	<	fInfo.dielect = 0.0;
609	>	temp = useEAM;
610	>	MPI_Allreduce(&temp, &useEAM, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
611
612	<	if( useDipoles ){
613	<	if( useReactionField )fInfo.dielect = dielectric;
614	<	}
612	>	temp = useSC;
613	>	MPI_Allreduce(&temp, &useSC, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
614	>
615	>	temp = useShape;
616	>	MPI_Allreduce(&temp, &useShape, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
617	>
618	>	temp = useFLARB;
619	>	MPI_Allreduce(&temp, &useFLARB, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
620
621	<	fInfo.SIM_uses_PBC = usePBC;
622	<	//fInfo.SIM_uses_LJ = 0;
436	<	fInfo.SIM_uses_LJ = useLJ;
437	<	fInfo.SIM_uses_sticky = useSticky;
438	<	//fInfo.SIM_uses_sticky = 0;
439	<	fInfo.SIM_uses_charges = useCharges;
440	<	fInfo.SIM_uses_dipoles = useDipoles;
441	<	//fInfo.SIM_uses_dipoles = 0;
442	<	fInfo.SIM_uses_RF = useReactionField;
443	<	//fInfo.SIM_uses_RF = 0;
444	<	fInfo.SIM_uses_GB = useGB;
445	<	fInfo.SIM_uses_EAM = useEAM;
621	>	temp = useRF;
622	>	MPI_Allreduce(&temp, &useRF, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
623
624	<	n_exclude = excludes->getSize();
625	<	excl = excludes->getFortranArray();
626	<
450	<	#ifdef IS_MPI
451	<	n_global = mpiSim->getNAtomsGlobal();
452	<	#else
453	<	n_global = n_atoms;
624	>	temp = useSF;
625	>	MPI_Allreduce(&temp, &useSF, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
626	>
627		#endif
455	–
456	–	isError = 0;
457	–
458	–	getFortranGroupArrays(this, FglobalGroupMembership, mfact);
459	–	//it may not be a good idea to pass the address of first element in vector
460	–	//since c++ standard does not require vector to be stored continuously in meomory
461	–	//Most of the compilers will organize the memory of vector continuously
462	–	setFsimulation( &fInfo, &n_global, &n_atoms, identArray, &n_exclude, excl,
463	–	&nGlobalExcludes, globalExcludes, molMembershipArray,
464	–	&mfact[0], &ngroup, &FglobalGroupMembership[0], &isError);
628
629	<	if( isError ){
630	<
631	<	sprintf( painCave.errMsg,
632	<	"There was an error setting the simulation information in fortran.\n" );
633	<	painCave.isFatal = 1;
634	<	painCave.severity = OOPSE_ERROR;
635	<	simError();
629	>	fInfo_.SIM_uses_PBC = usePBC;
630	>	fInfo_.SIM_uses_DirectionalAtoms = useDirectionalAtom;
631	>	fInfo_.SIM_uses_LennardJones = useLennardJones;
632	>	fInfo_.SIM_uses_Electrostatics = useElectrostatics;
633	>	fInfo_.SIM_uses_Charges = useCharge;
634	>	fInfo_.SIM_uses_Dipoles = useDipole;
635	>	fInfo_.SIM_uses_Sticky = useSticky;
636	>	fInfo_.SIM_uses_StickyPower = useStickyPower;
637	>	fInfo_.SIM_uses_GayBerne = useGayBerne;
638	>	fInfo_.SIM_uses_EAM = useEAM;
639	>	fInfo_.SIM_uses_SC = useSC;
640	>	fInfo_.SIM_uses_Shapes = useShape;
641	>	fInfo_.SIM_uses_FLARB = useFLARB;
642	>	fInfo_.SIM_uses_RF = useRF;
643	>	fInfo_.SIM_uses_SF = useSF;
644	>
645	>	if( myMethod == "REACTION_FIELD") {
646	>
647	>	if (simParams_->haveDielectric()) {
648	>	fInfo_.dielect = simParams_->getDielectric();
649	>	} else {
650	>	sprintf(painCave.errMsg,
651	>	"SimSetup Error: No Dielectric constant was set.\n"
652	>	"\tYou are trying to use Reaction Field without"
653	>	"\tsetting a dielectric constant!\n");
654	>	painCave.isFatal = 1;
655	>	simError();
656	>	}
657	>	}
658	>
659		}
474	–
475	–	#ifdef IS_MPI
476	–	sprintf( checkPointMsg,
477	–	"succesfully sent the simulation information to fortran.\n");
478	–	MPIcheckPoint();
479	–	#endif // is_mpi
480	–
481	–	this->ndf = this->getNDF();
482	–	this->ndfRaw = this->getNDFraw();
483	–	this->ndfTrans = this->getNDFtranslational();
484	–	}
660
661	<	void SimInfo::setDefaultRcut( double theRcut ){
662	<
663	<	haveRcut = 1;
664	<	rCut = theRcut;
665	<	rList = rCut + 1.0;
666	<
667	<	notifyFortranCutOffs( &rCut, &rSw, &rList );
493	<	}
661	>	void SimInfo::setupFortranSim() {
662	>	int isError;
663	>	int nExclude;
664	>	std::vector<int> fortranGlobalGroupMembership;
665	>
666	>	nExclude = exclude_.getSize();
667	>	isError = 0;
668
669	<	void SimInfo::setDefaultRcut( double theRcut, double theRsw ){
669	>	//globalGroupMembership_ is filled by SimCreator
670	>	for (int i = 0; i < nGlobalAtoms_; i++) {
671	>	fortranGlobalGroupMembership.push_back(globalGroupMembership_[i] + 1);
672	>	}
673
674	<	rSw = theRsw;
675	<	setDefaultRcut( theRcut );
676	<	}
674	>	//calculate mass ratio of cutoff group
675	>	std::vector<double> mfact;
676	>	SimInfo::MoleculeIterator mi;
677	>	Molecule* mol;
678	>	Molecule::CutoffGroupIterator ci;
679	>	CutoffGroup* cg;
680	>	Molecule::AtomIterator ai;
681	>	Atom* atom;
682	>	double totalMass;
683
684	+	//to avoid memory reallocation, reserve enough space for mfact
685	+	mfact.reserve(getNCutoffGroups());
686	+
687	+	for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
688	+	for (cg = mol->beginCutoffGroup(ci); cg != NULL; cg = mol->nextCutoffGroup(ci)) {
689
690	<	void SimInfo::checkCutOffs( void ){
691	<
692	<	if( boxIsInit ){
690	>	totalMass = cg->getMass();
691	>	for(atom = cg->beginAtom(ai); atom != NULL; atom = cg->nextAtom(ai)) {
692	>	// Check for massless groups - set mfact to 1 if true
693	>	if (totalMass != 0)
694	>	mfact.push_back(atom->getMass()/totalMass);
695	>	else
696	>	mfact.push_back( 1.0 );
697	>	}
698	>
699	>	}
700	>	}
701	>
702	>	//fill ident array of local atoms (it is actually ident of AtomType, it is so confusing !!!)
703	>	std::vector<int> identArray;
704	>
705	>	//to avoid memory reallocation, reserve enough space identArray
706	>	identArray.reserve(getNAtoms());
707
708	<	//we need to check cutOffs against the box
708	>	for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
709	>	for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
710	>	identArray.push_back(atom->getIdent());
711	>	}
712	>	}
713	>
714	>	//fill molMembershipArray
715	>	//molMembershipArray is filled by SimCreator
716	>	std::vector<int> molMembershipArray(nGlobalAtoms_);
717	>	for (int i = 0; i < nGlobalAtoms_; i++) {
718	>	molMembershipArray[i] = globalMolMembership_[i] + 1;
719	>	}
720
721	<	if( rCut > maxCutoff ){
721	>	//setup fortran simulation
722	>	int nGlobalExcludes = 0;
723	>	int* globalExcludes = NULL;
724	>	int* excludeList = exclude_.getExcludeList();
725	>	setFortranSim( &fInfo_, &nGlobalAtoms_, &nAtoms_, &identArray[0], &nExclude, excludeList ,
726	>	&nGlobalExcludes, globalExcludes, &molMembershipArray[0],
727	>	&mfact[0], &nCutoffGroups_, &fortranGlobalGroupMembership[0], &isError);
728	>
729	>	if( isError ){
730	>
731		sprintf( painCave.errMsg,
732	<	"cutoffRadius is too large for the current periodic box.\n"
511	<	"\tCurrent Value of cutoffRadius = %G at time %G\n "
512	<	"\tThis is larger than half of at least one of the\n"
513	<	"\tperiodic box vectors.  Right now, the Box matrix is:\n"
514	<	"\n"
515	<	"\t[ %G %G %G ]\n"
516	<	"\t[ %G %G %G ]\n"
517	<	"\t[ %G %G %G ]\n",
518	<	rCut, currentTime,
519	<	Hmat[0][0], Hmat[0][1], Hmat[0][2],
520	<	Hmat[1][0], Hmat[1][1], Hmat[1][2],
521	<	Hmat[2][0], Hmat[2][1], Hmat[2][2]);
522	<	painCave.severity = OOPSE_ERROR;
732	>	"There was an error setting the simulation information in fortran.\n" );
733		painCave.isFatal = 1;
734	+	painCave.severity = OOPSE_ERROR;
735		simError();
736	<	}
737	<	} else {
738	<	// initialize this stuff before using it, OK?
739	<	sprintf( painCave.errMsg,
740	<	"Trying to check cutoffs without a box.\n"
741	<	"\tOOPSE should have better programmers than that.\n" );
742	<	painCave.severity = OOPSE_ERROR;
532	<	painCave.isFatal = 1;
533	<	simError();
736	>	}
737	>
738	>	#ifdef IS_MPI
739	>	sprintf( checkPointMsg,
740	>	"succesfully sent the simulation information to fortran.\n");
741	>	MPIcheckPoint();
742	>	#endif // is_mpi
743		}
535	–
536	–	}
744
538	–	void SimInfo::addProperty(GenericData* prop){
745
746	<	map<string, GenericData*>::iterator result;
747	<	result = properties.find(prop->getID());
542	<
543	<	//we can't simply use  properties[prop->getID()] = prop,
544	<	//it will cause memory leak if we already contain a propery which has the same name of prop
545	<
546	<	if(result != properties.end()){
746	>	#ifdef IS_MPI
747	>	void SimInfo::setupFortranParallel() {
748
749	<	delete (*result).second;
750	<	(*result).second = prop;
751	<
752	<	}
753	<	else{
749	>	//SimInfo is responsible for creating localToGlobalAtomIndex and localToGlobalGroupIndex
750	>	std::vector<int> localToGlobalAtomIndex(getNAtoms(), 0);
751	>	std::vector<int> localToGlobalCutoffGroupIndex;
752	>	SimInfo::MoleculeIterator mi;
753	>	Molecule::AtomIterator ai;
754	>	Molecule::CutoffGroupIterator ci;
755	>	Molecule* mol;
756	>	Atom* atom;
757	>	CutoffGroup* cg;
758	>	mpiSimData parallelData;
759	>	int isError;
760
761	<	properties[prop->getID()] = prop;
761	>	for (mol = beginMolecule(mi); mol != NULL; mol  = nextMolecule(mi)) {
762
763	+	//local index(index in DataStorge) of atom is important
764	+	for (atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
765	+	localToGlobalAtomIndex[atom->getLocalIndex()] = atom->getGlobalIndex() + 1;
766	+	}
767	+
768	+	//local index of cutoff group is trivial, it only depends on the order of travesing
769	+	for (cg = mol->beginCutoffGroup(ci); cg != NULL; cg = mol->nextCutoffGroup(ci)) {
770	+	localToGlobalCutoffGroupIndex.push_back(cg->getGlobalIndex() + 1);
771	+	}
772	+
773	+	}
774	+
775	+	//fill up mpiSimData struct
776	+	parallelData.nMolGlobal = getNGlobalMolecules();
777	+	parallelData.nMolLocal = getNMolecules();
778	+	parallelData.nAtomsGlobal = getNGlobalAtoms();
779	+	parallelData.nAtomsLocal = getNAtoms();
780	+	parallelData.nGroupsGlobal = getNGlobalCutoffGroups();
781	+	parallelData.nGroupsLocal = getNCutoffGroups();
782	+	parallelData.myNode = worldRank;
783	+	MPI_Comm_size(MPI_COMM_WORLD, &(parallelData.nProcessors));
784	+
785	+	//pass mpiSimData struct and index arrays to fortran
786	+	setFsimParallel(&parallelData, &(parallelData.nAtomsLocal),
787	+	&localToGlobalAtomIndex[0],  &(parallelData.nGroupsLocal),
788	+	&localToGlobalCutoffGroupIndex[0], &isError);
789	+
790	+	if (isError) {
791	+	sprintf(painCave.errMsg,
792	+	"mpiRefresh errror: fortran didn't like something we gave it.\n");
793	+	painCave.isFatal = 1;
794	+	simError();
795	+	}
796	+
797	+	sprintf(checkPointMsg, " mpiRefresh successful.\n");
798	+	MPIcheckPoint();
799	+
800	+
801		}
557	–
558	–	}
802
803	<	GenericData* SimInfo::getProperty(const string& propName){
561	<
562	<	map<string, GenericData*>::iterator result;
563	<
564	<	//string lowerCaseName = ();
565	<
566	<	result = properties.find(propName);
567	<
568	<	if(result != properties.end())
569	<	return (*result).second;
570	<	else
571	<	return NULL;
572	<	}
803	>	#endif
804
805	+	double SimInfo::calcMaxCutoffRadius() {
806
575	–	void SimInfo::getFortranGroupArrays(SimInfo* info,
576	–	vector<int>& FglobalGroupMembership,
577	–	vector<double>& mfact){
578	–
579	–	Molecule* myMols;
580	–	Atom** myAtoms;
581	–	int numAtom;
582	–	double mtot;
583	–	int numMol;
584	–	int numCutoffGroups;
585	–	CutoffGroup* myCutoffGroup;
586	–	vector<CutoffGroup*>::iterator iterCutoff;
587	–	Atom* cutoffAtom;
588	–	vector<Atom*>::iterator iterAtom;
589	–	int atomIndex;
590	–	double totalMass;
591	–
592	–	mfact.clear();
593	–	FglobalGroupMembership.clear();
594	–
807
808	<	// Fix the silly fortran indexing problem
808	>	std::set<AtomType*> atomTypes;
809	>	std::set<AtomType*>::iterator i;
810	>	std::vector<double> cutoffRadius;
811	>
812	>	//get the unique atom types
813	>	atomTypes = getUniqueAtomTypes();
814	>
815	>	//query the max cutoff radius among these atom types
816	>	for (i = atomTypes.begin(); i != atomTypes.end(); ++i) {
817	>	cutoffRadius.push_back(forceField_->getRcutFromAtomType(*i));
818	>	}
819	>
820	>	double maxCutoffRadius = *(std::max_element(cutoffRadius.begin(), cutoffRadius.end()));
821		#ifdef IS_MPI
822	<	numAtom = mpiSim->getNAtomsGlobal();
599	<	#else
600	<	numAtom = n_atoms;
822	>	//pick the max cutoff radius among the processors
823		#endif
602	–	for (int i = 0; i < numAtom; i++)
603	–	FglobalGroupMembership.push_back(globalGroupMembership[i] + 1);
604	–
824
825	<	myMols = info->molecules;
826	<	numMol = info->n_mol;
608	<	for(int i  = 0; i < numMol; i++){
609	<	numCutoffGroups = myMols[i].getNCutoffGroups();
610	<	for(myCutoffGroup =myMols[i].beginCutoffGroup(iterCutoff);
611	<	myCutoffGroup != NULL;
612	<	myCutoffGroup =myMols[i].nextCutoffGroup(iterCutoff)){
825	>	return maxCutoffRadius;
826	>	}
827
828	<	totalMass = myCutoffGroup->getMass();
829	<
830	<	for(cutoffAtom = myCutoffGroup->beginAtom(iterAtom);
831	<	cutoffAtom != NULL;
832	<	cutoffAtom = myCutoffGroup->nextAtom(iterAtom)){
833	<	mfact.push_back(cutoffAtom->getMass()/totalMass);
834	<	}
828	>	void SimInfo::getCutoff(double& rcut, double& rsw) {
829	>
830	>	if (fInfo_.SIM_uses_Charges | fInfo_.SIM_uses_Dipoles | fInfo_.SIM_uses_RF) {
831	>
832	>	if (!simParams_->haveCutoffRadius()){
833	>	sprintf(painCave.errMsg,
834	>	"SimCreator Warning: No value was set for the cutoffRadius.\n"
835	>	"\tOOPSE will use a default value of 15.0 angstroms"
836	>	"\tfor the cutoffRadius.\n");
837	>	painCave.isFatal = 0;
838	>	simError();
839	>	rcut = 15.0;
840	>	} else{
841	>	rcut = simParams_->getCutoffRadius();
842	>	}
843	>
844	>	if (!simParams_->haveSwitchingRadius()){
845	>	sprintf(painCave.errMsg,
846	>	"SimCreator Warning: No value was set for switchingRadius.\n"
847	>	"\tOOPSE will use a default value of\n"
848	>	"\t0.85 * cutoffRadius for the switchingRadius\n");
849	>	painCave.isFatal = 0;
850	>	simError();
851	>	rsw = 0.85 * rcut;
852	>	} else{
853	>	rsw = simParams_->getSwitchingRadius();
854	>	}
855	>
856	>	} else {
857	>	// if charge, dipole or reaction field is not used and the cutofff radius is not specified in
858	>	//meta-data file, the maximum cutoff radius calculated from forcefiled will be used
859	>
860	>	if (simParams_->haveCutoffRadius()) {
861	>	rcut = simParams_->getCutoffRadius();
862	>	} else {
863	>	//set cutoff radius to the maximum cutoff radius based on atom types in the whole system
864	>	rcut = calcMaxCutoffRadius();
865	>	}
866	>
867	>	if (simParams_->haveSwitchingRadius()) {
868	>	rsw  = simParams_->getSwitchingRadius();
869	>	} else {
870	>	rsw = rcut;
871	>	}
872	>
873		}
874		}
875
876	<	}
876	>	void SimInfo::setupCutoff() {
877	>	getCutoff(rcut_, rsw_);
878	>	double rnblist = rcut_ + 1; // skin of neighbor list
879	>
880	>	//Pass these cutoff radius etc. to fortran. This function should be called once and only once
881	>
882	>	int cp =  TRADITIONAL_CUTOFF_POLICY;
883	>	if (simParams_->haveCutoffPolicy()) {
884	>	std::string myPolicy = simParams_->getCutoffPolicy();
885	>	toUpper(myPolicy);
886	>	if (myPolicy == "MIX") {
887	>	cp = MIX_CUTOFF_POLICY;
888	>	} else {
889	>	if (myPolicy == "MAX") {
890	>	cp = MAX_CUTOFF_POLICY;
891	>	} else {
892	>	if (myPolicy == "TRADITIONAL") {
893	>	cp = TRADITIONAL_CUTOFF_POLICY;
894	>	} else {
895	>	// throw error
896	>	sprintf( painCave.errMsg,
897	>	"SimInfo error: Unknown cutoffPolicy. (Input file specified %s .)\n\tcutoffPolicy must be one of: \"Mix\", \"Max\", or \"Traditional\".", myPolicy.c_str() );
898	>	painCave.isFatal = 1;
899	>	simError();
900	>	}
901	>	}
902	>	}
903	>	}
904	>
905	>
906	>	if (simParams_->haveSkinThickness()) {
907	>	double skinThickness = simParams_->getSkinThickness();
908	>	}
909	>
910	>	notifyFortranCutoffs(&rcut_, &rsw_, &rnblist, &cp);
911	>	// also send cutoff notification to electrostatics
912	>	setElectrostaticCutoffRadius(&rcut_, &rsw_);
913	>	}
914	>
915	>	void SimInfo::setupElectrostaticSummationMethod( int isError ) {
916	>
917	>	int errorOut;
918	>	int esm =  NONE;
919	>	int sm = UNDAMPED;
920	>	double alphaVal;
921	>	double dielectric;
922	>
923	>	errorOut = isError;
924	>	alphaVal = simParams_->getDampingAlpha();
925	>	dielectric = simParams_->getDielectric();
926	>
927	>	if (simParams_->haveElectrostaticSummationMethod()) {
928	>	std::string myMethod = simParams_->getElectrostaticSummationMethod();
929	>	toUpper(myMethod);
930	>	if (myMethod == "NONE") {
931	>	esm = NONE;
932	>	} else {
933	>	if (myMethod == "SWITCHING_FUNCTION") {
934	>	esm = SWITCHING_FUNCTION;
935	>	} else {
936	>	if (myMethod == "SHIFTED_POTENTIAL") {
937	>	esm = SHIFTED_POTENTIAL;
938	>	} else {
939	>	if (myMethod == "SHIFTED_FORCE") {
940	>	esm = SHIFTED_FORCE;
941	>	} else {
942	>	if (myMethod == "REACTION_FIELD") {
943	>	esm = REACTION_FIELD;
944	>	} else {
945	>	// throw error
946	>	sprintf( painCave.errMsg,
947	>	"SimInfo error: Unknown electrostaticSummationMethod. (Input file specified %s .)\n\telectrostaticSummationMethod must be one of: \"none\", \"shifted_potential\", \"shifted_force\", or \"reaction_field\".", myMethod.c_str() );
948	>	painCave.isFatal = 1;
949	>	simError();
950	>	}
951	>	}
952	>	}
953	>	}
954	>	}
955	>	}
956	>
957	>	if (simParams_->haveElectrostaticScreeningMethod()) {
958	>	std::string myScreen = simParams_->getElectrostaticScreeningMethod();
959	>	toUpper(myScreen);
960	>	if (myScreen == "UNDAMPED") {
961	>	sm = UNDAMPED;
962	>	} else {
963	>	if (myScreen == "DAMPED") {
964	>	sm = DAMPED;
965	>	if (!simParams_->haveDampingAlpha()) {
966	>	//throw error
967	>	sprintf( painCave.errMsg,
968	>	"SimInfo warning: dampingAlpha was not specified in the input file. A default value of %f (1/ang) will be used.", alphaVal);
969	>	painCave.isFatal = 0;
970	>	simError();
971	>	}
972	>	} else {
973	>	// throw error
974	>	sprintf( painCave.errMsg,
975	>	"SimInfo error: Unknown electrostaticScreeningMethod. (Input file specified %s .)\n\telectrostaticScreeningMethod must be one of: \"undamped\" or \"damped\".", myScreen.c_str() );
976	>	painCave.isFatal = 1;
977	>	simError();
978	>	}
979	>	}
980	>	}
981	>
982	>	// let's pass some summation method variables to fortran
983	>	setElectrostaticSummationMethod( &esm );
984	>	setScreeningMethod( &sm );
985	>	setDampingAlpha( &alphaVal );
986	>	setReactionFieldDielectric( &dielectric );
987	>	initFortranFF( &esm, &errorOut );
988	>	}
989	>
990	>	void SimInfo::setupSwitchingFunction() {
991	>	int ft = CUBIC;
992	>
993	>	if (simParams_->haveSwitchingFunctionType()) {
994	>	std::string funcType = simParams_->getSwitchingFunctionType();
995	>	toUpper(funcType);
996	>	if (funcType == "CUBIC") {
997	>	ft = CUBIC;
998	>	} else {
999	>	if (funcType == "FIFTH_ORDER_POLYNOMIAL") {
1000	>	ft = FIFTH_ORDER_POLY;
1001	>	} else {
1002	>	// throw error
1003	>	sprintf( painCave.errMsg,
1004	>	"SimInfo error: Unknown switchingFunctionType. (Input file specified %s .)\n\tswitchingFunctionType must be one of: \"cubic\" or \"fifth_order_polynomial\".", funcType.c_str() );
1005	>	painCave.isFatal = 1;
1006	>	simError();
1007	>	}
1008	>	}
1009	>	}
1010	>
1011	>	// send switching function notification to switcheroo
1012	>	setFunctionType(&ft);
1013	>
1014	>	}
1015	>
1016	>	void SimInfo::addProperty(GenericData* genData) {
1017	>	properties_.addProperty(genData);
1018	>	}
1019	>
1020	>	void SimInfo::removeProperty(const std::string& propName) {
1021	>	properties_.removeProperty(propName);
1022	>	}
1023	>
1024	>	void SimInfo::clearProperties() {
1025	>	properties_.clearProperties();
1026	>	}
1027	>
1028	>	std::vector<std::string> SimInfo::getPropertyNames() {
1029	>	return properties_.getPropertyNames();
1030	>	}
1031	>
1032	>	std::vector<GenericData*> SimInfo::getProperties() {
1033	>	return properties_.getProperties();
1034	>	}
1035	>
1036	>	GenericData* SimInfo::getPropertyByName(const std::string& propName) {
1037	>	return properties_.getPropertyByName(propName);
1038	>	}
1039	>
1040	>	void SimInfo::setSnapshotManager(SnapshotManager* sman) {
1041	>	if (sman_ == sman) {
1042	>	return;
1043	>	}
1044	>	delete sman_;
1045	>	sman_ = sman;
1046	>
1047	>	Molecule* mol;
1048	>	RigidBody* rb;
1049	>	Atom* atom;
1050	>	SimInfo::MoleculeIterator mi;
1051	>	Molecule::RigidBodyIterator rbIter;
1052	>	Molecule::AtomIterator atomIter;;
1053	>
1054	>	for (mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
1055	>
1056	>	for (atom = mol->beginAtom(atomIter); atom != NULL; atom = mol->nextAtom(atomIter)) {
1057	>	atom->setSnapshotManager(sman_);
1058	>	}
1059	>
1060	>	for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
1061	>	rb->setSnapshotManager(sman_);
1062	>	}
1063	>	}
1064	>
1065	>	}
1066	>
1067	>	Vector3d SimInfo::getComVel(){
1068	>	SimInfo::MoleculeIterator i;
1069	>	Molecule* mol;
1070	>
1071	>	Vector3d comVel(0.0);
1072	>	double totalMass = 0.0;
1073	>
1074	>
1075	>	for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1076	>	double mass = mol->getMass();
1077	>	totalMass += mass;
1078	>	comVel += mass * mol->getComVel();
1079	>	}
1080	>
1081	>	#ifdef IS_MPI
1082	>	double tmpMass = totalMass;
1083	>	Vector3d tmpComVel(comVel);
1084	>	MPI_Allreduce(&tmpMass,&totalMass,1,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1085	>	MPI_Allreduce(tmpComVel.getArrayPointer(), comVel.getArrayPointer(),3,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1086	>	#endif
1087	>
1088	>	comVel /= totalMass;
1089	>
1090	>	return comVel;
1091	>	}
1092	>
1093	>	Vector3d SimInfo::getCom(){
1094	>	SimInfo::MoleculeIterator i;
1095	>	Molecule* mol;
1096	>
1097	>	Vector3d com(0.0);
1098	>	double totalMass = 0.0;
1099	>
1100	>	for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1101	>	double mass = mol->getMass();
1102	>	totalMass += mass;
1103	>	com += mass * mol->getCom();
1104	>	}
1105	>
1106	>	#ifdef IS_MPI
1107	>	double tmpMass = totalMass;
1108	>	Vector3d tmpCom(com);
1109	>	MPI_Allreduce(&tmpMass,&totalMass,1,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1110	>	MPI_Allreduce(tmpCom.getArrayPointer(), com.getArrayPointer(),3,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1111	>	#endif
1112	>
1113	>	com /= totalMass;
1114	>
1115	>	return com;
1116	>
1117	>	}
1118	>
1119	>	std::ostream& operator <<(std::ostream& o, SimInfo& info) {
1120	>
1121	>	return o;
1122	>	}
1123	>
1124	>
1125	>	/*
1126	>	Returns center of mass and center of mass velocity in one function call.
1127	>	*/
1128	>
1129	>	void SimInfo::getComAll(Vector3d &com, Vector3d &comVel){
1130	>	SimInfo::MoleculeIterator i;
1131	>	Molecule* mol;
1132	>
1133	>
1134	>	double totalMass = 0.0;
1135	>
1136	>
1137	>	for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1138	>	double mass = mol->getMass();
1139	>	totalMass += mass;
1140	>	com += mass * mol->getCom();
1141	>	comVel += mass * mol->getComVel();
1142	>	}
1143	>
1144	>	#ifdef IS_MPI
1145	>	double tmpMass = totalMass;
1146	>	Vector3d tmpCom(com);
1147	>	Vector3d tmpComVel(comVel);
1148	>	MPI_Allreduce(&tmpMass,&totalMass,1,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1149	>	MPI_Allreduce(tmpCom.getArrayPointer(), com.getArrayPointer(),3,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1150	>	MPI_Allreduce(tmpComVel.getArrayPointer(), comVel.getArrayPointer(),3,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1151	>	#endif
1152	>
1153	>	com /= totalMass;
1154	>	comVel /= totalMass;
1155	>	}
1156	>
1157	>	/*
1158	>	Return intertia tensor for entire system and angular momentum Vector.
1159	>
1160	>
1161	>	[  Ixx -Ixy  -Ixz ]
1162	>	J =| -Iyx  Iyy  -Iyz |
1163	>	[ -Izx -Iyz   Izz ]
1164	>	*/
1165	>
1166	>	void SimInfo::getInertiaTensor(Mat3x3d &inertiaTensor, Vector3d &angularMomentum){
1167	>
1168	>
1169	>	double xx = 0.0;
1170	>	double yy = 0.0;
1171	>	double zz = 0.0;
1172	>	double xy = 0.0;
1173	>	double xz = 0.0;
1174	>	double yz = 0.0;
1175	>	Vector3d com(0.0);
1176	>	Vector3d comVel(0.0);
1177	>
1178	>	getComAll(com, comVel);
1179	>
1180	>	SimInfo::MoleculeIterator i;
1181	>	Molecule* mol;
1182	>
1183	>	Vector3d thisq(0.0);
1184	>	Vector3d thisv(0.0);
1185	>
1186	>	double thisMass = 0.0;
1187	>
1188	>
1189	>
1190	>
1191	>	for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1192	>
1193	>	thisq = mol->getCom()-com;
1194	>	thisv = mol->getComVel()-comVel;
1195	>	thisMass = mol->getMass();
1196	>	// Compute moment of intertia coefficients.
1197	>	xx += thisq[0]*thisq[0]*thisMass;
1198	>	yy += thisq[1]*thisq[1]*thisMass;
1199	>	zz += thisq[2]*thisq[2]*thisMass;
1200	>
1201	>	// compute products of intertia
1202	>	xy += thisq[0]*thisq[1]*thisMass;
1203	>	xz += thisq[0]*thisq[2]*thisMass;
1204	>	yz += thisq[1]*thisq[2]*thisMass;
1205	>
1206	>	angularMomentum += cross( thisq, thisv ) * thisMass;
1207	>
1208	>	}
1209	>
1210	>
1211	>	inertiaTensor(0,0) = yy + zz;
1212	>	inertiaTensor(0,1) = -xy;
1213	>	inertiaTensor(0,2) = -xz;
1214	>	inertiaTensor(1,0) = -xy;
1215	>	inertiaTensor(1,1) = xx + zz;
1216	>	inertiaTensor(1,2) = -yz;
1217	>	inertiaTensor(2,0) = -xz;
1218	>	inertiaTensor(2,1) = -yz;
1219	>	inertiaTensor(2,2) = xx + yy;
1220	>
1221	>	#ifdef IS_MPI
1222	>	Mat3x3d tmpI(inertiaTensor);
1223	>	Vector3d tmpAngMom;
1224	>	MPI_Allreduce(tmpI.getArrayPointer(), inertiaTensor.getArrayPointer(),9,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1225	>	MPI_Allreduce(tmpAngMom.getArrayPointer(), angularMomentum.getArrayPointer(),3,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1226	>	#endif
1227	>
1228	>	return;
1229	>	}
1230	>
1231	>	//Returns the angular momentum of the system
1232	>	Vector3d SimInfo::getAngularMomentum(){
1233	>
1234	>	Vector3d com(0.0);
1235	>	Vector3d comVel(0.0);
1236	>	Vector3d angularMomentum(0.0);
1237	>
1238	>	getComAll(com,comVel);
1239	>
1240	>	SimInfo::MoleculeIterator i;
1241	>	Molecule* mol;
1242	>
1243	>	Vector3d thisr(0.0);
1244	>	Vector3d thisp(0.0);
1245	>
1246	>	double thisMass;
1247	>
1248	>	for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1249	>	thisMass = mol->getMass();
1250	>	thisr = mol->getCom()-com;
1251	>	thisp = (mol->getComVel()-comVel)*thisMass;
1252	>
1253	>	angularMomentum += cross( thisr, thisp );
1254	>
1255	>	}
1256	>
1257	>	#ifdef IS_MPI
1258	>	Vector3d tmpAngMom;
1259	>	MPI_Allreduce(tmpAngMom.getArrayPointer(), angularMomentum.getArrayPointer(),3,MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
1260	>	#endif
1261	>
1262	>	return angularMomentum;
1263	>	}
1264	>
1265	>
1266	>	}//end namespace oopse
1267	>

Diff Legend

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