ViewVC Help

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

root/group/trunk/OOPSE/libmdtools/SimSetup.cpp

Comparing trunk/OOPSE/libmdtools/SimSetup.cpp (file contents):
Revision 708 by tim, Wed Aug 20 22:23:34 2003 UTC vs.
Revision 1104 by gezelter, Tue Apr 13 16:26:03 2004 UTC

#	Line 1 | Line 1
1		#include <algorithm>
2	<	#include <cstdlib>
2	>	#include <stdlib.h>
3		#include <iostream>
4	<	#include <cmath>
4	>	#include <math.h>
5		#include <string>
6	<	#include <sys/time.h>
7	<
6	>	#include <sprng.h>
7		#include "SimSetup.hpp"
8		#include "ReadWrite.hpp"
9		#include "parse_me.h"
10		#include "Integrator.hpp"
11		#include "simError.h"
12	+	#include "RigidBody.hpp"
13	+	//#include "ConjugateMinimizer.hpp"
14	+	#include "OOPSEMinimizer.hpp"
15
16		#ifdef IS_MPI
17		#include "mpiBASS.h"
#	Line 22 | Line 24
24		#define NVT_ENS        1
25		#define NPTi_ENS       2
26		#define NPTf_ENS       3
27	<	#define NPTim_ENS      4
26	<	#define NPTfm_ENS      5
27	>	#define NPTxyz_ENS     4
28
28	–	#define FF_DUFF 0
29	–	#define FF_LJ   1
30	–	#define FF_EAM  2
29
30	+	#define FF_DUFF  0
31	+	#define FF_LJ    1
32	+	#define FF_EAM   2
33	+	#define FF_H2O   3
34	+
35		using namespace std;
36
37	+	/**
38	+	* Check whether dividend is divisble by divisor or not
39	+	*/
40	+	bool isDivisible(double dividend, double divisor){
41	+	double tolerance = 0.000001;
42	+	double quotient;
43	+	double diff;
44	+	int intQuotient;
45	+
46	+	quotient = dividend / divisor;
47	+
48	+	if (quotient < 0)
49	+	quotient = -quotient;
50	+
51	+	intQuotient = int (quotient + tolerance);
52	+
53	+	diff = fabs(fabs(dividend) - intQuotient  * fabs(divisor));
54	+
55	+	if (diff <= tolerance)
56	+	return true;
57	+	else
58	+	return false;
59	+	}
60	+
61		SimSetup::SimSetup(){
62
63	+	initSuspend = false;
64		isInfoArray = 0;
65		nInfo = 1;
66	<
66	>
67		stamps = new MakeStamps();
68		globals = new Globals();
69	<
70	<
69	>
70	>
71		#ifdef IS_MPI
72	<	strcpy( checkPointMsg, "SimSetup creation successful" );
72	>	strcpy(checkPointMsg, "SimSetup creation successful");
73		MPIcheckPoint();
74		#endif // IS_MPI
75		}
#	Line 51 | Line 79 | SimSetup::~SimSetup(){
79		delete globals;
80		}
81
82	<	void SimSetup::setSimInfo( SimInfo* the_info, int theNinfo ) {
83	<	info = the_info;
84	<	nInfo = theNinfo;
85	<	isInfoArray = 1;
82	>	void SimSetup::setSimInfo(SimInfo* the_info, int theNinfo){
83	>	info = the_info;
84	>	nInfo = theNinfo;
85	>	isInfoArray = 1;
86	>	initSuspend = true;
87		}
88
89
90	<	void SimSetup::parseFile( char* fileName ){
62	<
90	>	void SimSetup::parseFile(char* fileName){
91		#ifdef IS_MPI
92	<	if( worldRank == 0 ){
92	>	if (worldRank == 0){
93		#endif // is_mpi
94	<
94	>
95		inFileName = fileName;
96	<	set_interface_stamps( stamps, globals );
97	<
96	>	set_interface_stamps(stamps, globals);
97	>
98		#ifdef IS_MPI
99		mpiEventInit();
100		#endif
101
102	<	yacc_BASS( fileName );
102	>	yacc_BASS(fileName);
103
104		#ifdef IS_MPI
105		throwMPIEvent(NULL);
106		}
107	<	else receiveParse();
107	>	else{
108	>	receiveParse();
109	>	}
110		#endif
111
112		}
113
114		#ifdef IS_MPI
115		void SimSetup::receiveParse(void){
116	<
117	<	set_interface_stamps( stamps, globals );
118	<	mpiEventInit();
119	<	MPIcheckPoint();
90	<	mpiEventLoop();
91	<
116	>	set_interface_stamps(stamps, globals);
117	>	mpiEventInit();
118	>	MPIcheckPoint();
119	>	mpiEventLoop();
120		}
121
122		#endif // is_mpi
123
124		void SimSetup::createSim(void){
125
98	–	int i, j, k, globalAtomIndex;
99	–
126		// gather all of the information from the Bass file
127
128		gatherInfo();
#	Line 111 | Line 137 | void SimSetup::createSim(void){
137
138		// initialize the system coordinates
139
140	<	if( !isInfoArray ) initSystemCoords();
140	>	if ( !initSuspend ){
141	>	initSystemCoords();
142
143	+	if( !(globals->getUseInitTime()) )
144	+	info[0].currentTime = 0.0;
145	+	}
146	+
147		// make the output filenames
148
149		makeOutNames();
150	<
151	<	// make the integrator
150	>
151	>	if (globals->haveMinimizer())
152	>	// make minimizer
153	>	makeMinimizer();
154	>	else
155	>	// make the integrator
156	>	makeIntegrator();
157
122	–	makeIntegrator();
123	–
158		#ifdef IS_MPI
159		mpiSim->mpiRefresh();
160		#endif
#	Line 128 | Line 162 | void SimSetup::createSim(void){
162		// initialize the Fortran
163
164		initFortran();
131	–
132	–
133	–
165		}
166
167
168	<	void SimSetup::makeMolecules( void ){
169	<
170	<	int k,l;
171	<	int i, j, exI, exJ, tempEx, stampID, atomOffset, excludeOffset;
168	>	void SimSetup::makeMolecules(void){
169	>	int i, j, k;
170	>	int exI, exJ, exK, exL, slI, slJ;
171	>	int tempI, tempJ, tempK, tempL;
172	>	int molI;
173	>	int stampID, atomOffset, rbOffset;
174		molInit molInfo;
175		DirectionalAtom* dAtom;
176	+	RigidBody* myRB;
177	+	StuntDouble* mySD;
178		LinkedAssign* extras;
179		LinkedAssign* current_extra;
180		AtomStamp* currentAtom;
181		BondStamp* currentBond;
182		BendStamp* currentBend;
183		TorsionStamp* currentTorsion;
184	+	RigidBodyStamp* currentRigidBody;
185
186		bond_pair* theBonds;
187		bend_set* theBends;
188		torsion_set* theTorsions;
189
190	<
190	>	set<int> skipList;
191	>
192	>	double phi, theta, psi;
193	>
194		//init the forceField paramters
195
196		the_ff->readParams();
197
159	–
198		// init the atoms
199
200	<	double ux, uy, uz, u, uSqr;
163	<
164	<	for(k=0; k<nInfo; k++){
165	<
166	<	the_ff->setSimInfo( &(info[k]) );
200	>	int nMembers, nNew, rb1, rb2;
201
202	+	for (k = 0; k < nInfo; k++){
203	+	the_ff->setSimInfo(&(info[k]));
204	+
205		atomOffset = 0;
206	<	excludeOffset = 0;
207	<	for(i=0; i<info[k].n_mol; i++){
171	<
206	>
207	>	for (i = 0; i < info[k].n_mol; i++){
208		stampID = info[k].molecules[i].getStampID();
209
210	<	molInfo.nAtoms    = comp_stamps[stampID]->getNAtoms();
211	<	molInfo.nBonds    = comp_stamps[stampID]->getNBonds();
212	<	molInfo.nBends    = comp_stamps[stampID]->getNBends();
210	>	molInfo.nAtoms = comp_stamps[stampID]->getNAtoms();
211	>	molInfo.nBonds = comp_stamps[stampID]->getNBonds();
212	>	molInfo.nBends = comp_stamps[stampID]->getNBends();
213		molInfo.nTorsions = comp_stamps[stampID]->getNTorsions();
214	<	molInfo.nExcludes = molInfo.nBonds + molInfo.nBends + molInfo.nTorsions;
214	>	molInfo.nRigidBodies = comp_stamps[stampID]->getNRigidBodies();
215
216		molInfo.myAtoms = &(info[k].atoms[atomOffset]);
181	–	molInfo.myExcludes = &(info[k].excludes[excludeOffset]);
182	–	molInfo.myBonds = new Bond*[molInfo.nBonds];
183	–	molInfo.myBends = new Bend*[molInfo.nBends];
184	–	molInfo.myTorsions = new Torsion*[molInfo.nTorsions];
217
218	+	if (molInfo.nBonds > 0)
219	+	molInfo.myBonds = new (Bond *) [molInfo.nBonds];
220	+	else
221	+	molInfo.myBonds = NULL;
222	+
223	+	if (molInfo.nBends > 0)
224	+	molInfo.myBends = new (Bend *) [molInfo.nBends];
225	+	else
226	+	molInfo.myBends = NULL;
227	+
228	+	if (molInfo.nTorsions > 0)
229	+	molInfo.myTorsions = new (Torsion *) [molInfo.nTorsions];
230	+	else
231	+	molInfo.myTorsions = NULL;
232	+
233		theBonds = new bond_pair[molInfo.nBonds];
234		theBends = new bend_set[molInfo.nBends];
235		theTorsions = new torsion_set[molInfo.nTorsions];
236	<
236	>
237		// make the Atoms
238	<
239	<	for(j=0; j<molInfo.nAtoms; j++){
240	<
241	<	currentAtom = comp_stamps[stampID]->getAtom( j );
242	<	if( currentAtom->haveOrientation() ){
243	<
244	<	dAtom = new DirectionalAtom( (j + atomOffset),
245	<	info[k].getConfiguration() );
246	<	info[k].n_oriented++;
247	<	molInfo.myAtoms[j] = dAtom;
248	<
249	<	ux = currentAtom->getOrntX();
250	<	uy = currentAtom->getOrntY();
251	<	uz = currentAtom->getOrntZ();
252	<
253	<	uSqr = (ux * ux) + (uy * uy) + (uz * uz);
254	<
255	<	u = sqrt( uSqr );
256	<	ux = ux / u;
257	<	uy = uy / u;
258	<	uz = uz / u;
259	<
260	<	dAtom->setSUx( ux );
261	<	dAtom->setSUy( uy );
262	<	dAtom->setSUz( uz );
263	<	}
264	<	else{
265	<	molInfo.myAtoms[j] = new GeneralAtom( (j + atomOffset),
219	<	info[k].getConfiguration() );
220	<	}
221	<	molInfo.myAtoms[j]->setType( currentAtom->getType() );
222	<
238	>
239	>	for (j = 0; j < molInfo.nAtoms; j++){
240	>	currentAtom = comp_stamps[stampID]->getAtom(j);
241	>
242	>	if (currentAtom->haveOrientation()){
243	>	dAtom = new DirectionalAtom((j + atomOffset),
244	>	info[k].getConfiguration());
245	>	info[k].n_oriented++;
246	>	molInfo.myAtoms[j] = dAtom;
247	>
248	>	// Directional Atoms have standard unit vectors which are oriented
249	>	// in space using the three Euler angles.  We assume the standard
250	>	// unit vector was originally along the z axis below.
251	>
252	>	phi = currentAtom->getEulerPhi() * M_PI / 180.0;
253	>	theta = currentAtom->getEulerTheta() * M_PI / 180.0;
254	>	psi = currentAtom->getEulerPsi()* M_PI / 180.0;
255	>
256	>	dAtom->setUnitFrameFromEuler(phi, theta, psi);
257	>
258	>	}
259	>	else{
260	>
261	>	molInfo.myAtoms[j] = new Atom((j + atomOffset), info[k].getConfiguration());
262	>	}
263	>
264	>	molInfo.myAtoms[j]->setType(currentAtom->getType());
265	>
266		#ifdef IS_MPI
267	<
268	<	molInfo.myAtoms[j]->setGlobalIndex( globalIndex[j+atomOffset] );
269	<
267	>
268	>	molInfo.myAtoms[j]->setGlobalIndex(globalIndex[j + atomOffset]);
269	>
270		#endif // is_mpi
271		}
272	<
273	<	// make the bonds
274	<	for(j=0; j<molInfo.nBonds; j++){
275	<
276	<	currentBond = comp_stamps[stampID]->getBond( j );
277	<	theBonds[j].a = currentBond->getA() + atomOffset;
278	<	theBonds[j].b = currentBond->getB() + atomOffset;
279	<
280	<	exI = theBonds[j].a;
281	<	exJ = theBonds[j].b;
282	<
283	<	// exclude_I must always be the smaller of the pair
284	<	if( exI > exJ ){
285	<	tempEx = exI;
286	<	exI = exJ;
287	<	exJ = tempEx;
288	<	}
289	<	#ifdef IS_MPI
290	<	tempEx = exI;
291	<	exI = info[k].atoms[tempEx]->getGlobalIndex() + 1;
292	<	tempEx = exJ;
250	<	exJ = info[k].atoms[tempEx]->getGlobalIndex() + 1;
251	<
252	<	info[k].excludes[j+excludeOffset]->setPair( exI, exJ );
253	<	#else  // isn't MPI
254	<
255	<	info[k].excludes[j+excludeOffset]->setPair( (exI+1), (exJ+1) );
256	<	#endif  //is_mpi
257	<	}
258	<	excludeOffset += molInfo.nBonds;
259	<
272	>
273	>	// make the bonds
274	>	for (j = 0; j < molInfo.nBonds; j++){
275	>	currentBond = comp_stamps[stampID]->getBond(j);
276	>	theBonds[j].a = currentBond->getA() + atomOffset;
277	>	theBonds[j].b = currentBond->getB() + atomOffset;
278	>
279	>	tempI = theBonds[j].a;
280	>	tempJ = theBonds[j].b;
281	>
282	>	#ifdef IS_MPI
283	>	exI = info[k].atoms[tempI]->getGlobalIndex() + 1;
284	>	exJ = info[k].atoms[tempJ]->getGlobalIndex() + 1;
285	>	#else
286	>	exI = tempI + 1;
287	>	exJ = tempJ + 1;
288	>	#endif
289	>
290	>	info[k].excludes->addPair(exI, exJ);
291	>	}
292	>
293		//make the bends
294	<	for(j=0; j<molInfo.nBends; j++){
295	<
296	<	currentBend = comp_stamps[stampID]->getBend( j );
297	<	theBends[j].a = currentBend->getA() + atomOffset;
298	<	theBends[j].b = currentBend->getB() + atomOffset;
299	<	theBends[j].c = currentBend->getC() + atomOffset;
300	<
301	<	if( currentBend->haveExtras() ){
302	<
303	<	extras = currentBend->getExtras();
304	<	current_extra = extras;
305	<
306	<	while( current_extra != NULL ){
307	<	if( !strcmp( current_extra->getlhs(), "ghostVectorSource" )){
308	<
309	<	switch( current_extra->getType() ){
310	<
311	<	case 0:
312	<	theBends[j].ghost =
313	<	current_extra->getInt() + atomOffset;
314	<	theBends[j].isGhost = 1;
315	<	break;
316	<
317	<	case 1:
318	<	theBends[j].ghost =
319	<	(int)current_extra->getDouble() + atomOffset;
320	<	theBends[j].isGhost = 1;
321	<	break;
322	<
323	<	default:
324	<	sprintf( painCave.errMsg,
325	<	"SimSetup Error: ghostVectorSource was neither a "
326	<	"double nor an int.\n"
327	<	"-->Bend[%d] in %s\n",
328	<	j, comp_stamps[stampID]->getID() );
329	<	painCave.isFatal = 1;
330	<	simError();
294	>	for (j = 0; j < molInfo.nBends; j++){
295	>	currentBend = comp_stamps[stampID]->getBend(j);
296	>	theBends[j].a = currentBend->getA() + atomOffset;
297	>	theBends[j].b = currentBend->getB() + atomOffset;
298	>	theBends[j].c = currentBend->getC() + atomOffset;
299	>
300	>	if (currentBend->haveExtras()){
301	>	extras = currentBend->getExtras();
302	>	current_extra = extras;
303	>
304	>	while (current_extra != NULL){
305	>	if (!strcmp(current_extra->getlhs(), "ghostVectorSource")){
306	>	switch (current_extra->getType()){
307	>	case 0:
308	>	theBends[j].ghost = current_extra->getInt() + atomOffset;
309	>	theBends[j].isGhost = 1;
310	>	break;
311	>
312	>	case 1:
313	>	theBends[j].ghost = (int) current_extra->getDouble() +
314	>	atomOffset;
315	>	theBends[j].isGhost = 1;
316	>	break;
317	>
318	>	default:
319	>	sprintf(painCave.errMsg,
320	>	"SimSetup Error: ghostVectorSource was neither a "
321	>	"double nor an int.\n"
322	>	"-->Bend[%d] in %s\n",
323	>	j, comp_stamps[stampID]->getID());
324	>	painCave.isFatal = 1;
325	>	simError();
326	>	}
327	>	}
328	>	else{
329	>	sprintf(painCave.errMsg,
330	>	"SimSetup Error: unhandled bend assignment:\n"
331	>	"    -->%s in Bend[%d] in %s\n",
332	>	current_extra->getlhs(), j, comp_stamps[stampID]->getID());
333	>	painCave.isFatal = 1;
334	>	simError();
335	>	}
336	>
337	>	current_extra = current_extra->getNext();
338	>	}
339		}
340	+
341	+	if (theBends[j].isGhost) {
342	+
343	+	tempI = theBends[j].a;
344	+	tempJ = theBends[j].b;
345	+
346	+	#ifdef IS_MPI
347	+	exI = info[k].atoms[tempI]->getGlobalIndex() + 1;
348	+	exJ = info[k].atoms[tempJ]->getGlobalIndex() + 1;
349	+	#else
350	+	exI = tempI + 1;
351	+	exJ = tempJ + 1;
352	+	#endif
353	+	info[k].excludes->addPair(exI, exJ);
354	+
355	+	} else {
356	+
357	+	tempI = theBends[j].a;
358	+	tempJ = theBends[j].b;
359	+	tempK = theBends[j].c;
360	+
361	+	#ifdef IS_MPI
362	+	exI = info[k].atoms[tempI]->getGlobalIndex() + 1;
363	+	exJ = info[k].atoms[tempJ]->getGlobalIndex() + 1;
364	+	exK = info[k].atoms[tempK]->getGlobalIndex() + 1;
365	+	#else
366	+	exI = tempI + 1;
367	+	exJ = tempJ + 1;
368	+	exK = tempK + 1;
369	+	#endif
370	+
371	+	info[k].excludes->addPair(exI, exK);
372	+	info[k].excludes->addPair(exI, exJ);
373	+	info[k].excludes->addPair(exJ, exK);
374	+	}
375		}
376	<
377	<	else{
376	>
377	>	for (j = 0; j < molInfo.nTorsions; j++){
378	>	currentTorsion = comp_stamps[stampID]->getTorsion(j);
379	>	theTorsions[j].a = currentTorsion->getA() + atomOffset;
380	>	theTorsions[j].b = currentTorsion->getB() + atomOffset;
381	>	theTorsions[j].c = currentTorsion->getC() + atomOffset;
382	>	theTorsions[j].d = currentTorsion->getD() + atomOffset;
383	>
384	>	tempI = theTorsions[j].a;
385	>	tempJ = theTorsions[j].b;
386	>	tempK = theTorsions[j].c;
387	>	tempL = theTorsions[j].d;
388	>
389	>	#ifdef IS_MPI
390	>	exI = info[k].atoms[tempI]->getGlobalIndex() + 1;
391	>	exJ = info[k].atoms[tempJ]->getGlobalIndex() + 1;
392	>	exK = info[k].atoms[tempK]->getGlobalIndex() + 1;
393	>	exL = info[k].atoms[tempL]->getGlobalIndex() + 1;
394	>	#else
395	>	exI = tempI + 1;
396	>	exJ = tempJ + 1;
397	>	exK = tempK + 1;
398	>	exL = tempL + 1;
399	>	#endif
400	>
401	>	info[k].excludes->addPair(exI, exJ);
402	>	info[k].excludes->addPair(exI, exK);
403	>	info[k].excludes->addPair(exI, exL);
404	>	info[k].excludes->addPair(exJ, exK);
405	>	info[k].excludes->addPair(exJ, exL);
406	>	info[k].excludes->addPair(exK, exL);
407	>	}
408	>
409	>	for (j = 0; j < molInfo.nRigidBodies; j++){
410	>
411	>	currentRigidBody = comp_stamps[stampID]->getRigidBody(j);
412	>	nMembers = currentRigidBody->getNMembers();
413	>
414	>	// Create the Rigid Body:
415	>
416	>	myRB = new RigidBody();
417
418	<	sprintf( painCave.errMsg,
419	<	"SimSetup Error: unhandled bend assignment:\n"
420	<	"    -->%s in Bend[%d] in %s\n",
421	<	current_extra->getlhs(),
422	<	j, comp_stamps[stampID]->getID() );
423	<	painCave.isFatal = 1;
424	<	simError();
418	>	for (rb1 = 0; rb1 < nMembers; rb1++) {
419	>
420	>	// molI is atom numbering inside this molecule
421	>	molI = currentRigidBody->getMember(rb1);
422	>
423	>	// tempI is atom numbering on local processor
424	>	tempI = molI + atomOffset;
425	>
426	>	// currentAtom is the AtomStamp (which we need for
427	>	// rigid body reference positions)
428	>	currentAtom = comp_stamps[stampID]->getAtom(molI);
429	>
430	>	// When we add to the rigid body, add the atom itself and
431	>	// the stamp info:
432	>
433	>	myRB->addAtom(info[k].atoms[tempI], currentAtom);
434	>
435	>	// Add this atom to the Skip List for the integrators
436	>	#ifdef IS_MPI
437	>	slI = info[k].atoms[tempI]->getGlobalIndex();
438	>	#else
439	>	slI = tempI;
440	>	#endif
441	>	skipList.insert(slI);
442	>
443	>	}
444	>
445	>	for(rb1 = 0; rb1 < nMembers - 1; rb1++) {
446	>	for(rb2 = rb1+1; rb2 < nMembers; rb2++) {
447	>
448	>	tempI = currentRigidBody->getMember(rb1);
449	>	tempJ = currentRigidBody->getMember(rb2);
450	>
451	>	// Some explanation is required here.
452	>	// Fortran indexing starts at 1, while c indexing starts at 0
453	>	// Also, in parallel computations, the GlobalIndex is
454	>	// used for the exclude list:
455	>
456	>	#ifdef IS_MPI
457	>	exI = info[k].atoms[tempI]->getGlobalIndex() + 1;
458	>	exJ = info[k].atoms[tempJ]->getGlobalIndex() + 1;
459	>	#else
460	>	exI = tempI + 1;
461	>	exJ = tempJ + 1;
462	>	#endif
463	>
464	>	info[k].excludes->addPair(exI, exJ);
465	>
466	>	}
467	>	}
468	>
469	>	molInfo.myRigidBodies.push_back(myRB);
470	>	info[k].rigidBodies.push_back(myRB);
471		}
472
473	<	current_extra = current_extra->getNext();
474	<	}
475	<	}
476	<
477	<	if( !theBends[j].isGhost ){
478	<
318	<	exI = theBends[j].a;
319	<	exJ = theBends[j].c;
320	<	}
321	<	else{
322	<
323	<	exI = theBends[j].a;
324	<	exJ = theBends[j].b;
325	<	}
326	<
327	<	// exclude_I must always be the smaller of the pair
328	<	if( exI > exJ ){
329	<	tempEx = exI;
330	<	exI = exJ;
331	<	exJ = tempEx;
332	<	}
473	>
474	>	// After this is all set up, scan through the atoms to
475	>	// see if they can be added to the integrableObjects:
476	>
477	>	for (j = 0; j < molInfo.nAtoms; j++){
478	>
479		#ifdef IS_MPI
480	<	tempEx = exI;
481	<	exI = info[k].atoms[tempEx]->getGlobalIndex() + 1;
482	<	tempEx = exJ;
483	<	exJ = info[k].atoms[tempEx]->getGlobalIndex() + 1;
484	<
485	<	info[k].excludes[j+excludeOffset]->setPair( exI, exJ );
486	<	#else  // isn't MPI
487	<	info[k].excludes[j+excludeOffset]->setPair( (exI+1), (exJ+1) );
488	<	#endif  //is_mpi
480	>	slJ = molInfo.myAtoms[j]->getGlobalIndex();
481	>	#else
482	>	slJ = j+atomOffset;
483	>	#endif
484	>
485	>	// if they aren't on the skip list, then they can be integrated
486	>
487	>	if (skipList.find(slJ) == skipList.end()) {
488	>	mySD = (StuntDouble *) molInfo.myAtoms[j];
489	>	info[k].integrableObjects.push_back(mySD);
490	>	molInfo.myIntegrableObjects.push_back(mySD);
491	>	}
492		}
493	<	excludeOffset += molInfo.nBends;
494	<
495	<	for(j=0; j<molInfo.nTorsions; j++){
496	<
497	<	currentTorsion = comp_stamps[stampID]->getTorsion( j );
498	<	theTorsions[j].a = currentTorsion->getA() + atomOffset;
499	<	theTorsions[j].b = currentTorsion->getB() + atomOffset;
351	<	theTorsions[j].c = currentTorsion->getC() + atomOffset;
352	<	theTorsions[j].d = currentTorsion->getD() + atomOffset;
353	<
354	<	exI = theTorsions[j].a;
355	<	exJ = theTorsions[j].d;
356	<
357	<	// exclude_I must always be the smaller of the pair
358	<	if( exI > exJ ){
359	<	tempEx = exI;
360	<	exI = exJ;
361	<	exJ = tempEx;
362	<	}
363	<	#ifdef IS_MPI
364	<	tempEx = exI;
365	<	exI = info[k].atoms[tempEx]->getGlobalIndex() + 1;
366	<	tempEx = exJ;
367	<	exJ = info[k].atoms[tempEx]->getGlobalIndex() + 1;
368	<
369	<	info[k].excludes[j+excludeOffset]->setPair( exI, exJ );
370	<	#else  // isn't MPI
371	<	info[k].excludes[j+excludeOffset]->setPair( (exI+1), (exJ+1) );
372	<	#endif  //is_mpi
493	>
494	>	// all rigid bodies are integrated:
495	>
496	>	for (j = 0; j < molInfo.nRigidBodies; j++) {
497	>	mySD = (StuntDouble *) molInfo.myRigidBodies[j];
498	>	info[k].integrableObjects.push_back(mySD);
499	>	molInfo.myIntegrableObjects.push_back(mySD);
500		}
501	<	excludeOffset += molInfo.nTorsions;
501	>
502
376	–
503		// send the arrays off to the forceField for init.
504
505	<	the_ff->initializeAtoms( molInfo.nAtoms, molInfo.myAtoms );
506	<	the_ff->initializeBonds( molInfo.nBonds, molInfo.myBonds, theBonds );
507	<	the_ff->initializeBends( molInfo.nBends, molInfo.myBends, theBends );
508	<	the_ff->initializeTorsions( molInfo.nTorsions, molInfo.myTorsions, theTorsions );
509	<
384	<
385	<	info[k].molecules[i].initialize( molInfo );
505	>	the_ff->initializeAtoms(molInfo.nAtoms, molInfo.myAtoms);
506	>	the_ff->initializeBonds(molInfo.nBonds, molInfo.myBonds, theBonds);
507	>	the_ff->initializeBends(molInfo.nBends, molInfo.myBends, theBends);
508	>	the_ff->initializeTorsions(molInfo.nTorsions, molInfo.myTorsions,
509	>	theTorsions);
510
511	<
511	>	info[k].molecules[i].initialize(molInfo);
512	>
513	>
514		atomOffset += molInfo.nAtoms;
515		delete[] theBonds;
516		delete[] theBends;
517		delete[] theTorsions;
518	<	}
518	>	}
519		}
520	<
520	>
521		#ifdef IS_MPI
522	<	sprintf( checkPointMsg, "all molecules initialized succesfully" );
522	>	sprintf(checkPointMsg, "all molecules initialized succesfully");
523		MPIcheckPoint();
524		#endif // is_mpi
525	<
525	>
526		// clean up the forcefield
527
528	<	the_ff->calcRcut();
528	>	if (!globals->haveLJrcut()){
529	>
530	>	the_ff->calcRcut();
531	>
532	>	} else {
533	>
534	>	the_ff->setRcut( globals->getLJrcut() );
535	>	}
536	>
537		the_ff->cleanMe();
404	–
538		}
539
540	<	void SimSetup::initFromBass( void ){
408	<
540	>	void SimSetup::initFromBass(void){
541		int i, j, k;
542		int n_cells;
543		double cellx, celly, cellz;
#	Line 419 | Line 551 | void SimSetup::initFromBass( void ){
551		vel[1] = 0.0;
552		vel[2] = 0.0;
553
554	<	temp1 = (double)tot_nmol / 4.0;
555	<	temp2 = pow( temp1, ( 1.0 / 3.0 ) );
556	<	temp3 = ceil( temp2 );
554	>	temp1 = (double) tot_nmol / 4.0;
555	>	temp2 = pow(temp1, (1.0 / 3.0));
556	>	temp3 = ceil(temp2);
557
558	<	have_extra =0;
559	<	if( temp2 < temp3 ){ // we have a non-complete lattice
560	<	have_extra =1;
558	>	have_extra = 0;
559	>	if (temp2 < temp3){
560	>	// we have a non-complete lattice
561	>	have_extra = 1;
562
563	<	n_cells = (int)temp3 - 1;
563	>	n_cells = (int) temp3 - 1;
564		cellx = info[0].boxL[0] / temp3;
565		celly = info[0].boxL[1] / temp3;
566		cellz = info[0].boxL[2] / temp3;
567	<	n_extra = tot_nmol - ( 4 * n_cells * n_cells * n_cells );
568	<	temp1 = ((double)n_extra) / ( pow( temp3, 3.0 ) - pow( n_cells, 3.0 ) );
569	<	n_per_extra = (int)ceil( temp1 );
567	>	n_extra = tot_nmol - (4 * n_cells * n_cells * n_cells);
568	>	temp1 = ((double) n_extra) / (pow(temp3, 3.0) - pow(n_cells, 3.0));
569	>	n_per_extra = (int) ceil(temp1);
570
571	<	if( n_per_extra > 4){
572	<	sprintf( painCave.errMsg,
573	<	"SimSetup error. There has been an error in constructing"
574	<	" the non-complete lattice.\n" );
571	>	if (n_per_extra > 4){
572	>	sprintf(painCave.errMsg,
573	>	"SimSetup error. There has been an error in constructing"
574	>	" the non-complete lattice.\n");
575		painCave.isFatal = 1;
576		simError();
577		}
578		}
579		else{
580	<	n_cells = (int)temp3;
580	>	n_cells = (int) temp3;
581		cellx = info[0].boxL[0] / temp3;
582		celly = info[0].boxL[1] / temp3;
583		cellz = info[0].boxL[2] / temp3;
#	Line 455 | Line 588 | void SimSetup::initFromBass( void ){
588		current_comp = 0;
589		current_atom_ndx = 0;
590
591	<	for( i=0; i < n_cells ; i++ ){
592	<	for( j=0; j < n_cells; j++ ){
593	<	for( k=0; k < n_cells; k++ ){
591	>	for (i = 0; i < n_cells ; i++){
592	>	for (j = 0; j < n_cells; j++){
593	>	for (k = 0; k < n_cells; k++){
594	>	makeElement(i * cellx, j * celly, k * cellz);
595
596	<	makeElement( i * cellx,
463	<	j * celly,
464	<	k * cellz );
596	>	makeElement(i * cellx + 0.5 * cellx, j * celly + 0.5 * celly, k * cellz);
597
598	<	makeElement( i * cellx + 0.5 * cellx,
467	<	j * celly + 0.5 * celly,
468	<	k * cellz );
598	>	makeElement(i * cellx, j * celly + 0.5 * celly, k * cellz + 0.5 * cellz);
599
600	<	makeElement( i * cellx,
471	<	j * celly + 0.5 * celly,
472	<	k * cellz + 0.5 * cellz );
473	<
474	<	makeElement( i * cellx + 0.5 * cellx,
475	<	j * celly,
476	<	k * cellz + 0.5 * cellz );
600	>	makeElement(i * cellx + 0.5 * cellx, j * celly, k * cellz + 0.5 * cellz);
601		}
602		}
603		}
604
605	<	if( have_extra ){
605	>	if (have_extra){
606		done = 0;
607
608		int start_ndx;
609	<	for( i=0; i < (n_cells+1) && !done; i++ ){
610	<	for( j=0; j < (n_cells+1) && !done; j++ ){
609	>	for (i = 0; i < (n_cells + 1) && !done; i++){
610	>	for (j = 0; j < (n_cells + 1) && !done; j++){
611	>	if (i < n_cells){
612	>	if (j < n_cells){
613	>	start_ndx = n_cells;
614	>	}
615	>	else
616	>	start_ndx = 0;
617	>	}
618	>	else
619	>	start_ndx = 0;
620
621	<	if( i < n_cells ){
621	>	for (k = start_ndx; k < (n_cells + 1) && !done; k++){
622	>	makeElement(i * cellx, j * celly, k * cellz);
623	>	done = (current_mol >= tot_nmol);
624
625	<	if( j < n_cells ){
626	<	start_ndx = n_cells;
627	<	}
628	<	else start_ndx = 0;
629	<	}
495	<	else start_ndx = 0;
625	>	if (!done && n_per_extra > 1){
626	>	makeElement(i * cellx + 0.5 * cellx, j * celly + 0.5 * celly,
627	>	k * cellz);
628	>	done = (current_mol >= tot_nmol);
629	>	}
630
631	<	for( k=start_ndx; k < (n_cells+1) && !done; k++ ){
631	>	if (!done && n_per_extra > 2){
632	>	makeElement(i * cellx, j * celly + 0.5 * celly,
633	>	k * cellz + 0.5 * cellz);
634	>	done = (current_mol >= tot_nmol);
635	>	}
636
637	<	makeElement( i * cellx,
638	<	j * celly,
639	<	k * cellz );
640	<	done = ( current_mol >= tot_nmol );
641	<
642	<	if( !done && n_per_extra > 1 ){
505	<	makeElement( i * cellx + 0.5 * cellx,
506	<	j * celly + 0.5 * celly,
507	<	k * cellz );
508	<	done = ( current_mol >= tot_nmol );
509	<	}
510	<
511	<	if( !done && n_per_extra > 2){
512	<	makeElement( i * cellx,
513	<	j * celly + 0.5 * celly,
514	<	k * cellz + 0.5 * cellz );
515	<	done = ( current_mol >= tot_nmol );
516	<	}
517	<
518	<	if( !done && n_per_extra > 3){
519	<	makeElement( i * cellx + 0.5 * cellx,
520	<	j * celly,
521	<	k * cellz + 0.5 * cellz );
522	<	done = ( current_mol >= tot_nmol );
523	<	}
524	<	}
637	>	if (!done && n_per_extra > 3){
638	>	makeElement(i * cellx + 0.5 * cellx, j * celly,
639	>	k * cellz + 0.5 * cellz);
640	>	done = (current_mol >= tot_nmol);
641	>	}
642	>	}
643		}
644		}
645		}
646
647	<	for( i=0; i<info[0].n_atoms; i++ ){
648	<	info[0].atoms[i]->setVel( vel );
647	>	for (i = 0; i < info[0].n_atoms; i++){
648	>	info[0].atoms[i]->setVel(vel);
649		}
650		}
651
652	<	void SimSetup::makeElement( double x, double y, double z ){
535	<
652	>	void SimSetup::makeElement(double x, double y, double z){
653		int k;
654		AtomStamp* current_atom;
655		DirectionalAtom* dAtom;
656		double rotMat[3][3];
657		double pos[3];
658
659	<	for( k=0; k<comp_stamps[current_comp]->getNAtoms(); k++ ){
660	<
661	<	current_atom = comp_stamps[current_comp]->getAtom( k );
662	<	if( !current_atom->havePosition() ){
663	<	sprintf( painCave.errMsg,
664	<	"SimSetup:initFromBass error.\n"
665	<	"\tComponent %s, atom %s does not have a position specified.\n"
666	<	"\tThe initialization routine is unable to give a start"
667	<	" position.\n",
551	<	comp_stamps[current_comp]->getID(),
552	<	current_atom->getType() );
659	>	for (k = 0; k < comp_stamps[current_comp]->getNAtoms(); k++){
660	>	current_atom = comp_stamps[current_comp]->getAtom(k);
661	>	if (!current_atom->havePosition()){
662	>	sprintf(painCave.errMsg,
663	>	"SimSetup:initFromBass error.\n"
664	>	"\tComponent %s, atom %s does not have a position specified.\n"
665	>	"\tThe initialization routine is unable to give a start"
666	>	" position.\n",
667	>	comp_stamps[current_comp]->getID(), current_atom->getType());
668		painCave.isFatal = 1;
669		simError();
670		}
671	<
671	>
672		pos[0] = x + current_atom->getPosX();
673		pos[1] = y + current_atom->getPosY();
674		pos[2] = z + current_atom->getPosZ();
560	–
561	–	info[0].atoms[current_atom_ndx]->setPos( pos );
675
676	<	if( info[0].atoms[current_atom_ndx]->isDirectional() ){
676	>	info[0].atoms[current_atom_ndx]->setPos(pos);
677
678	<	dAtom = (DirectionalAtom *)info[0].atoms[current_atom_ndx];
678	>	if (info[0].atoms[current_atom_ndx]->isDirectional()){
679	>	dAtom = (DirectionalAtom *) info[0].atoms[current_atom_ndx];
680
681		rotMat[0][0] = 1.0;
682		rotMat[0][1] = 0.0;
#	Line 576 | Line 690 | void SimSetup::makeElement( double x, double y, double
690		rotMat[2][1] = 0.0;
691		rotMat[2][2] = 1.0;
692
693	<	dAtom->setA( rotMat );
693	>	dAtom->setA(rotMat);
694		}
695
696		current_atom_ndx++;
#	Line 585 | Line 699 | void SimSetup::makeElement( double x, double y, double
699		current_mol++;
700		current_comp_mol++;
701
702	<	if( current_comp_mol >= components_nmol[current_comp] ){
589	<
702	>	if (current_comp_mol >= components_nmol[current_comp]){
703		current_comp_mol = 0;
704		current_comp++;
705		}
706		}
707
708
709	<	void SimSetup::gatherInfo( void ){
710	<	int i,j,k;
709	>	void SimSetup::gatherInfo(void){
710	>	int i;
711
712		ensembleCase = -1;
713		ffCase = -1;
714
715		// set the easy ones first
716
717	<	for( i=0; i<nInfo; i++){
717	>	for (i = 0; i < nInfo; i++){
718		info[i].target_temp = globals->getTargetTemp();
719		info[i].dt = globals->getDt();
720		info[i].run_time = globals->getRunTime();
#	Line 611 | Line 724 | void SimSetup::gatherInfo( void ){
724
725		// get the forceField
726
727	<	strcpy( force_field, globals->getForceField() );
727	>	strcpy(force_field, globals->getForceField());
728
729	<	if( !strcasecmp( force_field, "DUFF" )) ffCase = FF_DUFF;
730	<	else if( !strcasecmp( force_field, "LJ" )) ffCase = FF_LJ;
731	<	else if( !strcasecmp( force_field, "EAM" )) ffCase = FF_EAM;
729	>	if (!strcasecmp(force_field, "DUFF")){
730	>	ffCase = FF_DUFF;
731	>	}
732	>	else if (!strcasecmp(force_field, "LJ")){
733	>	ffCase = FF_LJ;
734	>	}
735	>	else if (!strcasecmp(force_field, "EAM")){
736	>	ffCase = FF_EAM;
737	>	}
738	>	else if (!strcasecmp(force_field, "WATER")){
739	>	ffCase = FF_H2O;
740	>	}
741		else{
742	<	sprintf( painCave.errMsg,
743	<	"SimSetup Error. Unrecognized force field -> %s\n",
744	<	force_field );
745	<	painCave.isFatal = 1;
624	<	simError();
742	>	sprintf(painCave.errMsg, "SimSetup Error. Unrecognized force field -> %s\n",
743	>	force_field);
744	>	painCave.isFatal = 1;
745	>	simError();
746		}
747
748	<	// get the ensemble
748	>	// get the ensemble
749
750	<	strcpy( ensemble, globals->getEnsemble() );
750	>	strcpy(ensemble, globals->getEnsemble());
751
752	<	if( !strcasecmp( ensemble, "NVE" ))      ensembleCase = NVE_ENS;
753	<	else if( !strcasecmp( ensemble, "NVT" )) ensembleCase = NVT_ENS;
754	<	else if( !strcasecmp( ensemble, "NPTi" ) || !strcasecmp( ensemble, "NPT") )
752	>	if (!strcasecmp(ensemble, "NVE")){
753	>	ensembleCase = NVE_ENS;
754	>	}
755	>	else if (!strcasecmp(ensemble, "NVT")){
756	>	ensembleCase = NVT_ENS;
757	>	}
758	>	else if (!strcasecmp(ensemble, "NPTi") || !strcasecmp(ensemble, "NPT")){
759		ensembleCase = NPTi_ENS;
760	<	else if( !strcasecmp( ensemble, "NPTf" )) ensembleCase = NPTf_ENS;
761	<	else if( !strcasecmp( ensemble, "NPTim" )) ensembleCase = NPTim_ENS;
762	<	else if( !strcasecmp( ensemble, "NPTfm" )) ensembleCase = NPTfm_ENS;
760	>	}
761	>	else if (!strcasecmp(ensemble, "NPTf")){
762	>	ensembleCase = NPTf_ENS;
763	>	}
764	>	else if (!strcasecmp(ensemble, "NPTxyz")){
765	>	ensembleCase = NPTxyz_ENS;
766	>	}
767		else{
768	<	sprintf( painCave.errMsg,
769	<	"SimSetup Warning. Unrecognized Ensemble -> %s, "
770	<	"reverting to NVE for this simulation.\n",
771	<	ensemble );
772	<	painCave.isFatal = 0;
773	<	simError();
774	<	strcpy( ensemble, "NVE" );
775	<	ensembleCase = NVE_ENS;
768	>	sprintf(painCave.errMsg,
769	>	"SimSetup Warning. Unrecognized Ensemble -> %s \n"
770	>	"\treverting to NVE for this simulation.\n",
771	>	ensemble);
772	>	painCave.isFatal = 0;
773	>	simError();
774	>	strcpy(ensemble, "NVE");
775	>	ensembleCase = NVE_ENS;
776		}
648	–
649	–	for(i=0; i<nInfo; i++){
650	–
651	–	strcpy( info[i].ensemble, ensemble );
777
778	+	for (i = 0; i < nInfo; i++){
779	+	strcpy(info[i].ensemble, ensemble);
780	+
781		// get the mixing rule
782
783	<	strcpy( info[i].mixingRule, globals->getMixingRule() );
783	>	strcpy(info[i].mixingRule, globals->getMixingRule());
784		info[i].usePBC = globals->getPBC();
785		}
786	<
786	>
787		// get the components and calculate the tot_nMol and indvidual n_mol
788	<
788	>
789		the_components = globals->getComponents();
790		components_nmol = new int[n_components];
791
792
793	<	if( !globals->haveNMol() ){
793	>	if (!globals->haveNMol()){
794		// we don't have the total number of molecules, so we assume it is
795		// given in each component
796
797		tot_nmol = 0;
798	<	for( i=0; i<n_components; i++ ){
799	<
800	<	if( !the_components[i]->haveNMol() ){
801	<	// we have a problem
802	<	sprintf( painCave.errMsg,
803	<	"SimSetup Error. No global NMol or component NMol"
804	<	" given. Cannot calculate the number of atoms.\n" );
805	<	painCave.isFatal = 1;
678	<	simError();
798	>	for (i = 0; i < n_components; i++){
799	>	if (!the_components[i]->haveNMol()){
800	>	// we have a problem
801	>	sprintf(painCave.errMsg,
802	>	"SimSetup Error. No global NMol or component NMol given.\n"
803	>	"\tCannot calculate the number of atoms.\n");
804	>	painCave.isFatal = 1;
805	>	simError();
806		}
807
808		tot_nmol += the_components[i]->getNMol();
#	Line 683 | Line 810 | void SimSetup::gatherInfo( void ){
810		}
811		}
812		else{
813	<	sprintf( painCave.errMsg,
814	<	"SimSetup error.\n"
815	<	"\tSorry, the ability to specify total"
816	<	" nMols and then give molfractions in the components\n"
817	<	"\tis not currently supported."
818	<	" Please give nMol in the components.\n" );
813	>	sprintf(painCave.errMsg,
814	>	"SimSetup error.\n"
815	>	"\tSorry, the ability to specify total"
816	>	" nMols and then give molfractions in the components\n"
817	>	"\tis not currently supported."
818	>	" Please give nMol in the components.\n");
819		painCave.isFatal = 1;
820		simError();
821		}
822
823	+	//check whether sample time, status time, thermal time and reset time are divisble by dt
824	+	if (!isDivisible(globals->getSampleTime(), globals->getDt())){
825	+	sprintf(painCave.errMsg,
826	+	"Sample time is not divisible by dt.\n"
827	+	"\tThis will result in samples that are not uniformly\n"
828	+	"\tdistributed in time.  If this is a problem, change\n"
829	+	"\tyour sampleTime variable.\n");
830	+	painCave.isFatal = 0;
831	+	simError();
832	+	}
833	+
834	+	if (globals->haveStatusTime() && !isDivisible(globals->getSampleTime(), globals->getDt())){
835	+	sprintf(painCave.errMsg,
836	+	"Status time is not divisible by dt.\n"
837	+	"\tThis will result in status reports that are not uniformly\n"
838	+	"\tdistributed in time.  If this is a problem, change \n"
839	+	"\tyour statusTime variable.\n");
840	+	painCave.isFatal = 0;
841	+	simError();
842	+	}
843	+
844	+	if (globals->haveThermalTime() && !isDivisible(globals->getThermalTime(), globals->getDt())){
845	+	sprintf(painCave.errMsg,
846	+	"Thermal time is not divisible by dt.\n"
847	+	"\tThis will result in thermalizations that are not uniformly\n"
848	+	"\tdistributed in time.  If this is a problem, change \n"
849	+	"\tyour thermalTime variable.\n");
850	+	painCave.isFatal = 0;
851	+	simError();
852	+	}
853	+
854	+	if (globals->haveResetTime() && !isDivisible(globals->getResetTime(), globals->getDt())){
855	+	sprintf(painCave.errMsg,
856	+	"Reset time is not divisible by dt.\n"
857	+	"\tThis will result in integrator resets that are not uniformly\n"
858	+	"\tdistributed in time.  If this is a problem, change\n"
859	+	"\tyour resetTime variable.\n");
860	+	painCave.isFatal = 0;
861	+	simError();
862	+	}
863	+
864		// set the status, sample, and thermal kick times
697	–
698	–	for(i=0; i<nInfo; i++){
865
866	<	if( globals->haveSampleTime() ){
866	>	for (i = 0; i < nInfo; i++){
867	>	if (globals->haveSampleTime()){
868		info[i].sampleTime = globals->getSampleTime();
869		info[i].statusTime = info[i].sampleTime;
870		info[i].thermalTime = info[i].sampleTime;
#	Line 707 | Line 874 | void SimSetup::gatherInfo( void ){
874		info[i].statusTime = info[i].sampleTime;
875		info[i].thermalTime = info[i].sampleTime;
876		}
877	<
878	<	if( globals->haveStatusTime() ){
877	>
878	>	if (globals->haveStatusTime()){
879		info[i].statusTime = globals->getStatusTime();
880		}
881	<
882	<	if( globals->haveThermalTime() ){
881	>
882	>	if (globals->haveThermalTime()){
883		info[i].thermalTime = globals->getThermalTime();
884		}
885
886	+	info[i].resetIntegrator = 0;
887	+	if( globals->haveResetTime() ){
888	+	info[i].resetTime = globals->getResetTime();
889	+	info[i].resetIntegrator = 1;
890	+	}
891	+
892		// check for the temperature set flag
893	+
894	+	if (globals->haveTempSet())
895	+	info[i].setTemp = globals->getTempSet();
896
897	<	if( globals->haveTempSet() ) info[i].setTemp = globals->getTempSet();
897	>	// check for the extended State init
898	>
899	>	info[i].useInitXSstate = globals->getUseInitXSstate();
900	>	info[i].orthoTolerance = globals->getOrthoBoxTolerance();
901
902	<	// get some of the tricky things that may still be in the globals
902	>	}
903	>
904	>	//setup seed for random number generator
905	>	int seedValue;
906	>
907	>	if (globals->haveSeed()){
908	>	seedValue = globals->getSeed();
909	>
910	>	if(seedValue / 1E9 == 0){
911	>	sprintf(painCave.errMsg,
912	>	"Seed for sprng library should contain at least 9 digits\n"
913	>	"OOPSE will generate a seed for user\n");
914	>	painCave.isFatal = 0;
915	>	simError();
916	>
917	>	//using seed generated by system instead of invalid seed set by user
918	>	#ifndef IS_MPI
919	>	seedValue = make_sprng_seed();
920	>	#else
921	>	if (worldRank == 0){
922	>	seedValue = make_sprng_seed();
923	>	}
924	>	MPI_Bcast(&seedValue, 1, MPI_INT, 0, MPI_COMM_WORLD);
925	>	#endif
926	>	}
927	>	}//end of if branch of globals->haveSeed()
928	>	else{
929
930	<	double boxVector[3];
931	<	if( globals->haveBox() ){
932	<	boxVector[0] = globals->getBox();
933	<	boxVector[1] = globals->getBox();
934	<	boxVector[2] = globals->getBox();
730	<
731	<	info[i].setBox( boxVector );
930	>	#ifndef IS_MPI
931	>	seedValue = make_sprng_seed();
932	>	#else
933	>	if (worldRank == 0){
934	>	seedValue = make_sprng_seed();
935		}
936	<	else if( globals->haveDensity() ){
734	<
735	<	double vol;
736	<	vol = (double)tot_nmol / globals->getDensity();
737	<	boxVector[0] = pow( vol, ( 1.0 / 3.0 ) );
738	<	boxVector[1] = boxVector[0];
739	<	boxVector[2] = boxVector[0];
740	<
741	<	info[i].setBox( boxVector );
742	<	}
743	<	else{
744	<	if( !globals->haveBoxX() ){
745	<	sprintf( painCave.errMsg,
746	<	"SimSetup error, no periodic BoxX size given.\n" );
747	<	painCave.isFatal = 1;
748	<	simError();
749	<	}
750	<	boxVector[0] = globals->getBoxX();
751	<
752	<	if( !globals->haveBoxY() ){
753	<	sprintf( painCave.errMsg,
754	<	"SimSetup error, no periodic BoxY size given.\n" );
755	<	painCave.isFatal = 1;
756	<	simError();
757	<	}
758	<	boxVector[1] = globals->getBoxY();
759	<
760	<	if( !globals->haveBoxZ() ){
761	<	sprintf( painCave.errMsg,
762	<	"SimSetup error, no periodic BoxZ size given.\n" );
763	<	painCave.isFatal = 1;
764	<	simError();
765	<	}
766	<	boxVector[2] = globals->getBoxZ();
767	<
768	<	info[i].setBox( boxVector );
769	<	}
770	<	}
771	<
772	<	int seedValue;
773	<	struct timeval now_time_val;
774	<	struct timezone time_zone;
775	<
776	<	if(globals->haveSeed()){
777	<	seedValue = globals->getSeed();
778	<	}
779	<	else{
780	<	#ifndef IS_MPI
781	<	gettimeofday(&now_time_val, &time_zone);  // get the time now
782	<	seedValue = (int) now_time_val.tv_sec;      //  convert to epoch time
783	<	#else
784	<	if(worldRank == 0){
785	<	gettimeofday(&now_time_val, &time_zone);  // get the time now
786	<	seedValue = (int) now_time_val.tv_sec;      //  convert to epoch time
787	<	}
788	<	MPI_Bcast(&seedValue, 1, MPI_INT, 0, MPI_COMM_WORLD);
936	>	MPI_Bcast(&seedValue, 1, MPI_INT, 0, MPI_COMM_WORLD);
937		#endif
938	<	}
938	>	}//end of globals->haveSeed()
939
940	<	for(int i = 0; i < nInfo; i++){
940	>	for (int i = 0; i < nInfo; i++){
941		info[i].setSeed(seedValue);
942		}
943	<
943	>
944		#ifdef IS_MPI
945	<	strcpy( checkPointMsg, "Succesfully gathered all information from Bass\n" );
945	>	strcpy(checkPointMsg, "Successfully gathered all information from Bass\n");
946		MPIcheckPoint();
947		#endif // is_mpi
800	–
948		}
949
950
951	<	void SimSetup::finalInfoCheck( void ){
951	>	void SimSetup::finalInfoCheck(void){
952		int index;
953		int usesDipoles;
954		int i;
955
956	<	for(i=0; i<nInfo; i++){
956	>	for (i = 0; i < nInfo; i++){
957		// check electrostatic parameters
958	<
958	>
959		index = 0;
960		usesDipoles = 0;
961	<	while( (index < info[i].n_atoms) && !usesDipoles ){
961	>	while ((index < info[i].n_atoms) && !usesDipoles){
962		usesDipoles = (info[i].atoms[index])->hasDipole();
963		index++;
964		}
965	<
965	>
966		#ifdef IS_MPI
967		int myUse = usesDipoles;
968	<	MPI_Allreduce( &myUse, &usesDipoles, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD );
968	>	MPI_Allreduce(&myUse, &usesDipoles, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
969		#endif //is_mpi
970	<
970	>
971		double theEcr, theEst;
972	<
973	<	if (globals->getUseRF() ) {
972	>
973	>	if (globals->getUseRF()){
974		info[i].useReactionField = 1;
975	<
976	<	if( !globals->haveECR() ){
977	<	sprintf( painCave.errMsg,
978	<	"SimSetup Warning: using default value of 1/2 the smallest "
979	<	"box length for the electrostaticCutoffRadius.\n"
980	<	"I hope you have a very fast processor!\n");
981	<	painCave.isFatal = 0;
982	<	simError();
983	<	double smallest;
837	<	smallest = info[i].boxL[0];
838	<	if (info[i].boxL[1] <= smallest) smallest = info[i].boxL[1];
839	<	if (info[i].boxL[2] <= smallest) smallest = info[i].boxL[2];
840	<	theEcr = 0.5 * smallest;
841	<	} else {
842	<	theEcr = globals->getECR();
975	>
976	>	if (!globals->haveECR()){
977	>	sprintf(painCave.errMsg,
978	>	"SimSetup Warning: No value was set for electrostaticCutoffRadius.\n"
979	>	"\tOOPSE will use a default value of 15.0 angstroms"
980	>	"\tfor the electrostaticCutoffRadius.\n");
981	>	painCave.isFatal = 0;
982	>	simError();
983	>	theEcr = 15.0;
984		}
985	<
986	<	if( !globals->haveEST() ){
846	<	sprintf( painCave.errMsg,
847	<	"SimSetup Warning: using default value of 0.05 * the "
848	<	"electrostaticCutoffRadius for the electrostaticSkinThickness\n"
849	<	);
850	<	painCave.isFatal = 0;
851	<	simError();
852	<	theEst = 0.05 * theEcr;
853	<	} else {
854	<	theEst= globals->getEST();
985	>	else{
986	>	theEcr = globals->getECR();
987		}
988	<
989	<	info[i].setEcr( theEcr, theEst );
990	<
991	<	if(!globals->haveDielectric() ){
992	<	sprintf( painCave.errMsg,
993	<	"SimSetup Error: You are trying to use Reaction Field without"
994	<	"setting a dielectric constant!\n"
995	<	);
996	<	painCave.isFatal = 1;
997	<	simError();
988	>
989	>	if (!globals->haveEST()){
990	>	sprintf(painCave.errMsg,
991	>	"SimSetup Warning: No value was set for electrostaticSkinThickness.\n"
992	>	"\tOOPSE will use a default value of\n"
993	>	"\t0.05 * electrostaticCutoffRadius\n"
994	>	"\tfor the electrostaticSkinThickness\n");
995	>	painCave.isFatal = 0;
996	>	simError();
997	>	theEst = 0.05 * theEcr;
998		}
999	<	info[i].dielectric = globals->getDielectric();
1000	<	}
869	<	else {
870	<	if (usesDipoles) {
871	<
872	<	if( !globals->haveECR() ){
873	<	sprintf( painCave.errMsg,
874	<	"SimSetup Warning: using default value of 1/2 the smallest "
875	<	"box length for the electrostaticCutoffRadius.\n"
876	<	"I hope you have a very fast processor!\n");
877	<	painCave.isFatal = 0;
878	<	simError();
879	<	double smallest;
880	<	smallest = info[i].boxL[0];
881	<	if (info[i].boxL[1] <= smallest) smallest = info[i].boxL[1];
882	<	if (info[i].boxL[2] <= smallest) smallest = info[i].boxL[2];
883	<	theEcr = 0.5 * smallest;
884	<	} else {
885	<	theEcr = globals->getECR();
886	<	}
887	<
888	<	if( !globals->haveEST() ){
889	<	sprintf( painCave.errMsg,
890	<	"SimSetup Warning: using default value of 0.05 * the "
891	<	"electrostaticCutoffRadius for the "
892	<	"electrostaticSkinThickness\n"
893	<	);
894	<	painCave.isFatal = 0;
895	<	simError();
896	<	theEst = 0.05 * theEcr;
897	<	} else {
898	<	theEst= globals->getEST();
899	<	}
900	<
901	<	info[i].setEcr( theEcr, theEst );
999	>	else{
1000	>	theEst = globals->getEST();
1001		}
903	–	}
904	–	}
1002
1003	+	info[i].setDefaultEcr(theEcr, theEst);
1004	+
1005	+	if (!globals->haveDielectric()){
1006	+	sprintf(painCave.errMsg,
1007	+	"SimSetup Error: No Dielectric constant was set.\n"
1008	+	"\tYou are trying to use Reaction Field without"
1009	+	"\tsetting a dielectric constant!\n");
1010	+	painCave.isFatal = 1;
1011	+	simError();
1012	+	}
1013	+	info[i].dielectric = globals->getDielectric();
1014	+	}
1015	+	else{
1016	+	if (usesDipoles){
1017	+	if (!globals->haveECR()){
1018	+	sprintf(painCave.errMsg,
1019	+	"SimSetup Warning: No value was set for electrostaticCutoffRadius.\n"
1020	+	"\tOOPSE will use a default value of 15.0 angstroms"
1021	+	"\tfor the electrostaticCutoffRadius.\n");
1022	+	painCave.isFatal = 0;
1023	+	simError();
1024	+	theEcr = 15.0;
1025	+	}
1026	+	else{
1027	+	theEcr = globals->getECR();
1028	+	}
1029	+
1030	+	if (!globals->haveEST()){
1031	+	sprintf(painCave.errMsg,
1032	+	"SimSetup Warning: No value was set for electrostaticSkinThickness.\n"
1033	+	"\tOOPSE will use a default value of\n"
1034	+	"\t0.05 * electrostaticCutoffRadius\n"
1035	+	"\tfor the electrostaticSkinThickness\n");
1036	+	painCave.isFatal = 0;
1037	+	simError();
1038	+	theEst = 0.05 * theEcr;
1039	+	}
1040	+	else{
1041	+	theEst = globals->getEST();
1042	+	}
1043	+
1044	+	info[i].setDefaultEcr(theEcr, theEst);
1045	+	}
1046	+	}
1047	+	}
1048		#ifdef IS_MPI
1049	<	strcpy( checkPointMsg, "post processing checks out" );
1049	>	strcpy(checkPointMsg, "post processing checks out");
1050		MPIcheckPoint();
1051		#endif // is_mpi
910	–
1052		}
912	–
913	–	void SimSetup::initSystemCoords( void ){
914	–	int i;
1053
1054	+	void SimSetup::initSystemCoords(void){
1055	+	int i;
1056	+
1057		char* inName;
1058
1059	<	(info[0].getConfiguration())->createArrays( info[0].n_atoms );
1059	>	(info[0].getConfiguration())->createArrays(info[0].n_atoms);
1060
1061	<	for(i=0; i<info[0].n_atoms; i++) info[0].atoms[i]->setCoords();
1062	<
1063	<	if( globals->haveInitialConfig() ){
1064	<
1061	>	for (i = 0; i < info[0].n_atoms; i++)
1062	>	info[0].atoms[i]->setCoords();
1063	>
1064	>	if (globals->haveInitialConfig()){
1065		InitializeFromFile* fileInit;
1066		#ifdef IS_MPI // is_mpi
1067	<	if( worldRank == 0 ){
1067	>	if (worldRank == 0){
1068		#endif //is_mpi
1069		inName = globals->getInitialConfig();
1070	<	double* tempDouble = new double[1000000];
930	<	fileInit = new InitializeFromFile( inName );
1070	>	fileInit = new InitializeFromFile(inName);
1071		#ifdef IS_MPI
1072	<	}else fileInit = new InitializeFromFile( NULL );
1072	>	}
1073	>	else
1074	>	fileInit = new InitializeFromFile(NULL);
1075		#endif
1076	<	fileInit->readInit( info ); // default velocities on
1077	<
1076	>	fileInit->readInit(info); // default velocities on
1077	>
1078		delete fileInit;
1079		}
1080		else{
1081
940	–	#ifdef IS_MPI
941	–
1082		// no init from bass
1083
1084	<	sprintf( painCave.errMsg,
1085	<	"Cannot intialize a parallel simulation without an initial configuration file.\n" );
1086	<	painCave.isFatal;
1084	>	sprintf(painCave.errMsg,
1085	>	"Cannot intialize a simulation without an initial configuration file.\n");
1086	>	painCave.isFatal = 1;;
1087		simError();
1088
949	–	#else
950	–
951	–	initFromBass();
952	–
953	–
954	–	#endif
1089		}
1090	<
1090	>
1091		#ifdef IS_MPI
1092	<	strcpy( checkPointMsg, "Successfully read in the initial configuration" );
1092	>	strcpy(checkPointMsg, "Successfully read in the initial configuration");
1093		MPIcheckPoint();
1094		#endif // is_mpi
961	–
1095		}
1096
1097
1098	<	void SimSetup::makeOutNames( void ){
966	<
1098	>	void SimSetup::makeOutNames(void){
1099		int k;
1100
969	–
970	–	for(k=0; k<nInfo; k++){
1101
1102	+	for (k = 0; k < nInfo; k++){
1103		#ifdef IS_MPI
1104	<	if( worldRank == 0 ){
1104	>	if (worldRank == 0){
1105		#endif // is_mpi
1106	<
1107	<	if( globals->haveFinalConfig() ){
1108	<	strcpy( info[k].finalName, globals->getFinalConfig() );
1106	>
1107	>	if (globals->haveFinalConfig()){
1108	>	strcpy(info[k].finalName, globals->getFinalConfig());
1109		}
1110		else{
1111	<	strcpy( info[k].finalName, inFileName );
1112	<	char* endTest;
1113	<	int nameLength = strlen( info[k].finalName );
1114	<	endTest = &(info[k].finalName[nameLength - 5]);
1115	<	if( !strcmp( endTest, ".bass" ) ){
1116	<	strcpy( endTest, ".eor" );
1117	<	}
1118	<	else if( !strcmp( endTest, ".BASS" ) ){
1119	<	strcpy( endTest, ".eor" );
1120	<	}
1121	<	else{
1122	<	endTest = &(info[k].finalName[nameLength - 4]);
1123	<	if( !strcmp( endTest, ".bss" ) ){
1124	<	strcpy( endTest, ".eor" );
1125	<	}
1126	<	else if( !strcmp( endTest, ".mdl" ) ){
1127	<	strcpy( endTest, ".eor" );
1128	<	}
1129	<	else{
1130	<	strcat( info[k].finalName, ".eor" );
1131	<	}
1132	<	}
1111	>	strcpy(info[k].finalName, inFileName);
1112	>	char* endTest;
1113	>	int nameLength = strlen(info[k].finalName);
1114	>	endTest = &(info[k].finalName[nameLength - 5]);
1115	>	if (!strcmp(endTest, ".bass")){
1116	>	strcpy(endTest, ".eor");
1117	>	}
1118	>	else if (!strcmp(endTest, ".BASS")){
1119	>	strcpy(endTest, ".eor");
1120	>	}
1121	>	else{
1122	>	endTest = &(info[k].finalName[nameLength - 4]);
1123	>	if (!strcmp(endTest, ".bss")){
1124	>	strcpy(endTest, ".eor");
1125	>	}
1126	>	else if (!strcmp(endTest, ".mdl")){
1127	>	strcpy(endTest, ".eor");
1128	>	}
1129	>	else{
1130	>	strcat(info[k].finalName, ".eor");
1131	>	}
1132	>	}
1133		}
1134	<
1134	>
1135		// make the sample and status out names
1136	<
1137	<	strcpy( info[k].sampleName, inFileName );
1136	>
1137	>	strcpy(info[k].sampleName, inFileName);
1138		char* endTest;
1139	<	int nameLength = strlen( info[k].sampleName );
1139	>	int nameLength = strlen(info[k].sampleName);
1140		endTest = &(info[k].sampleName[nameLength - 5]);
1141	<	if( !strcmp( endTest, ".bass" ) ){
1142	<	strcpy( endTest, ".dump" );
1141	>	if (!strcmp(endTest, ".bass")){
1142	>	strcpy(endTest, ".dump");
1143		}
1144	<	else if( !strcmp( endTest, ".BASS" ) ){
1145	<	strcpy( endTest, ".dump" );
1144	>	else if (!strcmp(endTest, ".BASS")){
1145	>	strcpy(endTest, ".dump");
1146		}
1147		else{
1148	<	endTest = &(info[k].sampleName[nameLength - 4]);
1149	<	if( !strcmp( endTest, ".bss" ) ){
1150	<	strcpy( endTest, ".dump" );
1151	<	}
1152	<	else if( !strcmp( endTest, ".mdl" ) ){
1153	<	strcpy( endTest, ".dump" );
1154	<	}
1155	<	else{
1156	<	strcat( info[k].sampleName, ".dump" );
1157	<	}
1148	>	endTest = &(info[k].sampleName[nameLength - 4]);
1149	>	if (!strcmp(endTest, ".bss")){
1150	>	strcpy(endTest, ".dump");
1151	>	}
1152	>	else if (!strcmp(endTest, ".mdl")){
1153	>	strcpy(endTest, ".dump");
1154	>	}
1155	>	else{
1156	>	strcat(info[k].sampleName, ".dump");
1157	>	}
1158		}
1159	<
1160	<	strcpy( info[k].statusName, inFileName );
1161	<	nameLength = strlen( info[k].statusName );
1159	>
1160	>	strcpy(info[k].statusName, inFileName);
1161	>	nameLength = strlen(info[k].statusName);
1162		endTest = &(info[k].statusName[nameLength - 5]);
1163	<	if( !strcmp( endTest, ".bass" ) ){
1164	<	strcpy( endTest, ".stat" );
1163	>	if (!strcmp(endTest, ".bass")){
1164	>	strcpy(endTest, ".stat");
1165		}
1166	<	else if( !strcmp( endTest, ".BASS" ) ){
1167	<	strcpy( endTest, ".stat" );
1166	>	else if (!strcmp(endTest, ".BASS")){
1167	>	strcpy(endTest, ".stat");
1168		}
1169		else{
1170	<	endTest = &(info[k].statusName[nameLength - 4]);
1171	<	if( !strcmp( endTest, ".bss" ) ){
1172	<	strcpy( endTest, ".stat" );
1173	<	}
1174	<	else if( !strcmp( endTest, ".mdl" ) ){
1175	<	strcpy( endTest, ".stat" );
1176	<	}
1177	<	else{
1178	<	strcat( info[k].statusName, ".stat" );
1179	<	}
1170	>	endTest = &(info[k].statusName[nameLength - 4]);
1171	>	if (!strcmp(endTest, ".bss")){
1172	>	strcpy(endTest, ".stat");
1173	>	}
1174	>	else if (!strcmp(endTest, ".mdl")){
1175	>	strcpy(endTest, ".stat");
1176	>	}
1177	>	else{
1178	>	strcat(info[k].statusName, ".stat");
1179	>	}
1180		}
1181	<
1181	>
1182		#ifdef IS_MPI
1183	+
1184		}
1185		#endif // is_mpi
1186		}
1187		}
1188
1189
1190	<	void SimSetup::sysObjectsCreation( void ){
1191	<
1192	<	int i,k;
1061	<
1190	>	void SimSetup::sysObjectsCreation(void){
1191	>	int i, k;
1192	>
1193		// create the forceField
1194
1195		createFF();
#	Line 1073 | Line 1204 | void SimSetup::sysObjectsCreation( void ){
1204
1205		#ifdef IS_MPI
1206		// divide the molecules among the processors
1207	<
1207	>
1208		mpiMolDivide();
1209		#endif //is_mpi
1210	<
1210	>
1211		// create the atom and SRI arrays. Also initialize Molecule Stamp ID's
1212	<
1212	>
1213		makeSysArrays();
1214
1215		// make and initialize the molecules (all but atomic coordinates)
1216	<
1216	>
1217		makeMolecules();
1218	<
1219	<	for(k=0; k<nInfo; k++){
1218	>
1219	>	for (k = 0; k < nInfo; k++){
1220		info[k].identArray = new int[info[k].n_atoms];
1221	<	for(i=0; i<info[k].n_atoms; i++){
1221	>	for (i = 0; i < info[k].n_atoms; i++){
1222		info[k].identArray[i] = info[k].atoms[i]->getIdent();
1223		}
1224		}
1225		}
1226
1227
1228	<	void SimSetup::createFF( void ){
1228	>	void SimSetup::createFF(void){
1229	>	switch (ffCase){
1230	>	case FF_DUFF:
1231	>	the_ff = new DUFF();
1232	>	break;
1233
1234	<	switch( ffCase ){
1234	>	case FF_LJ:
1235	>	the_ff = new LJFF();
1236	>	break;
1237
1238	<	case FF_DUFF:
1239	<	the_ff = new DUFF();
1240	<	break;
1238	>	case FF_EAM:
1239	>	the_ff = new EAM_FF();
1240	>	break;
1241
1242	<	case FF_LJ:
1243	<	the_ff = new LJFF();
1244	<	break;
1242	>	case FF_H2O:
1243	>	the_ff = new WATER();
1244	>	break;
1245
1246	<	case FF_EAM:
1247	<	the_ff = new EAM_FF();
1248	<	break;
1249	<
1250	<	default:
1114	<	sprintf( painCave.errMsg,
1115	<	"SimSetup Error. Unrecognized force field in case statement.\n");
1116	<	painCave.isFatal = 1;
1117	<	simError();
1246	>	default:
1247	>	sprintf(painCave.errMsg,
1248	>	"SimSetup Error. Unrecognized force field in case statement.\n");
1249	>	painCave.isFatal = 1;
1250	>	simError();
1251		}
1252
1253		#ifdef IS_MPI
1254	<	strcpy( checkPointMsg, "ForceField creation successful" );
1254	>	strcpy(checkPointMsg, "ForceField creation successful");
1255		MPIcheckPoint();
1256		#endif // is_mpi
1124	–
1257		}
1258
1259
1260	<	void SimSetup::compList( void ){
1129	<
1260	>	void SimSetup::compList(void){
1261		int i;
1262		char* id;
1263		LinkedMolStamp* headStamp = new LinkedMolStamp();
1264		LinkedMolStamp* currentStamp = NULL;
1265	<	comp_stamps = new MoleculeStamp*[n_components];
1266	<
1265	>	comp_stamps = new MoleculeStamp * [n_components];
1266	>
1267		// make an array of molecule stamps that match the components used.
1268		// also extract the used stamps out into a separate linked list
1269	<
1270	<	for(i=0; i<nInfo; i++){
1269	>
1270	>	for (i = 0; i < nInfo; i++){
1271		info[i].nComponents = n_components;
1272		info[i].componentsNmol = components_nmol;
1273		info[i].compStamps = comp_stamps;
1274		info[i].headStamp = headStamp;
1275		}
1145	–
1276
1147	–	for( i=0; i<n_components; i++ ){
1277
1278	+	for (i = 0; i < n_components; i++){
1279		id = the_components[i]->getType();
1280		comp_stamps[i] = NULL;
1281	<
1281	>
1282		// check to make sure the component isn't already in the list
1283
1284	<	comp_stamps[i] = headStamp->match( id );
1285	<	if( comp_stamps[i] == NULL ){
1156	<
1284	>	comp_stamps[i] = headStamp->match(id);
1285	>	if (comp_stamps[i] == NULL){
1286		// extract the component from the list;
1287	<
1288	<	currentStamp = stamps->extractMolStamp( id );
1289	<	if( currentStamp == NULL ){
1290	<	sprintf( painCave.errMsg,
1291	<	"SimSetup error: Component \"%s\" was not found in the "
1292	<	"list of declared molecules\n",
1293	<	id );
1294	<	painCave.isFatal = 1;
1295	<	simError();
1287	>
1288	>	currentStamp = stamps->extractMolStamp(id);
1289	>	if (currentStamp == NULL){
1290	>	sprintf(painCave.errMsg,
1291	>	"SimSetup error: Component \"%s\" was not found in the "
1292	>	"list of declared molecules\n",
1293	>	id);
1294	>	painCave.isFatal = 1;
1295	>	simError();
1296		}
1297	<
1298	<	headStamp->add( currentStamp );
1299	<	comp_stamps[i] = headStamp->match( id );
1297	>
1298	>	headStamp->add(currentStamp);
1299	>	comp_stamps[i] = headStamp->match(id);
1300		}
1301		}
1302
1303		#ifdef IS_MPI
1304	<	strcpy( checkPointMsg, "Component stamps successfully extracted\n" );
1304	>	strcpy(checkPointMsg, "Component stamps successfully extracted\n");
1305		MPIcheckPoint();
1306		#endif // is_mpi
1307	+	}
1308
1309	+	void SimSetup::calcSysValues(void){
1310	+	int i;
1311
1312	<	}
1312	>	int* molMembershipArray;
1313
1182	–	void SimSetup::calcSysValues( void ){
1183	–	int i, j, k;
1184	–
1185	–	int *molMembershipArray;
1186	–
1314		tot_atoms = 0;
1315		tot_bonds = 0;
1316		tot_bends = 0;
1317		tot_torsions = 0;
1318	<	for( i=0; i<n_components; i++ ){
1319	<
1320	<	tot_atoms +=    components_nmol[i] * comp_stamps[i]->getNAtoms();
1321	<	tot_bonds +=    components_nmol[i] * comp_stamps[i]->getNBonds();
1322	<	tot_bends +=    components_nmol[i] * comp_stamps[i]->getNBends();
1318	>	tot_rigid = 0;
1319	>	for (i = 0; i < n_components; i++){
1320	>	tot_atoms += components_nmol[i] * comp_stamps[i]->getNAtoms();
1321	>	tot_bonds += components_nmol[i] * comp_stamps[i]->getNBonds();
1322	>	tot_bends += components_nmol[i] * comp_stamps[i]->getNBends();
1323		tot_torsions += components_nmol[i] * comp_stamps[i]->getNTorsions();
1324	+	tot_rigid += components_nmol[i] * comp_stamps[i]->getNRigidBodies();
1325		}
1326
1327		tot_SRI = tot_bonds + tot_bends + tot_torsions;
1328		molMembershipArray = new int[tot_atoms];
1329	<
1330	<	for(i=0; i<nInfo; i++){
1329	>
1330	>	for (i = 0; i < nInfo; i++){
1331		info[i].n_atoms = tot_atoms;
1332		info[i].n_bonds = tot_bonds;
1333		info[i].n_bends = tot_bends;
1334		info[i].n_torsions = tot_torsions;
1335		info[i].n_SRI = tot_SRI;
1336		info[i].n_mol = tot_nmol;
1337	<
1337	>
1338		info[i].molMembershipArray = molMembershipArray;
1339	<	}
1339	>	}
1340		}
1341
1342		#ifdef IS_MPI
1343
1344	<	void SimSetup::mpiMolDivide( void ){
1217	<
1344	>	void SimSetup::mpiMolDivide(void){
1345		int i, j, k;
1346		int localMol, allMol;
1347		int local_atoms, local_bonds, local_bends, local_torsions, local_SRI;
1348	+	int local_rigid;
1349
1350	<	mpiSim = new mpiSimulation( info );
1351	<
1350	>	mpiSim = new mpiSimulation(info);
1351	>
1352		globalIndex = mpiSim->divideLabor();
1353
1354		// set up the local variables
1355	<
1355	>
1356		mol2proc = mpiSim->getMolToProcMap();
1357		molCompType = mpiSim->getMolComponentType();
1358	<
1358	>
1359		allMol = 0;
1360		localMol = 0;
1361		local_atoms = 0;
1362		local_bonds = 0;
1363		local_bends = 0;
1364		local_torsions = 0;
1365	+	local_rigid = 0;
1366		globalAtomIndex = 0;
1367
1368	<
1369	<	for( i=0; i<n_components; i++ ){
1370	<
1371	<	for( j=0; j<components_nmol[i]; j++ ){
1372	<
1373	<	if( mol2proc[allMol] == worldRank ){
1374	<
1375	<	local_atoms +=    comp_stamps[i]->getNAtoms();
1376	<	local_bonds +=    comp_stamps[i]->getNBonds();
1248	<	local_bends +=    comp_stamps[i]->getNBends();
1249	<	local_torsions += comp_stamps[i]->getNTorsions();
1250	<	localMol++;
1368	>	for (i = 0; i < n_components; i++){
1369	>	for (j = 0; j < components_nmol[i]; j++){
1370	>	if (mol2proc[allMol] == worldRank){
1371	>	local_atoms += comp_stamps[i]->getNAtoms();
1372	>	local_bonds += comp_stamps[i]->getNBonds();
1373	>	local_bends += comp_stamps[i]->getNBends();
1374	>	local_torsions += comp_stamps[i]->getNTorsions();
1375	>	local_rigid += comp_stamps[i]->getNRigidBodies();
1376	>	localMol++;
1377		}
1378	<	for (k = 0; k < comp_stamps[i]->getNAtoms(); k++) {
1378	>	for (k = 0; k < comp_stamps[i]->getNAtoms(); k++){
1379		info[0].molMembershipArray[globalAtomIndex] = allMol;
1380		globalAtomIndex++;
1381		}
1382
1383	<	allMol++;
1383	>	allMol++;
1384		}
1385		}
1386		local_SRI = local_bonds + local_bends + local_torsions;
1387	<
1387	>
1388		info[0].n_atoms = mpiSim->getMyNlocal();
1389
1390	<	if( local_atoms != info[0].n_atoms ){
1391	<	sprintf( painCave.errMsg,
1392	<	"SimSetup error: mpiSim's localAtom (%d) and SimSetup's"
1393	<	" localAtom (%d) are not equal.\n",
1394	<	info[0].n_atoms,
1395	<	local_atoms );
1390	>
1391	>	if (local_atoms != info[0].n_atoms){
1392	>	sprintf(painCave.errMsg,
1393	>	"SimSetup error: mpiSim's localAtom (%d) and SimSetup's\n"
1394	>	"\tlocalAtom (%d) are not equal.\n",
1395	>	info[0].n_atoms, local_atoms);
1396		painCave.isFatal = 1;
1397		simError();
1398		}
#	Line 1277 | Line 1403 | void SimSetup::mpiMolDivide( void ){
1403		info[0].n_SRI = local_SRI;
1404		info[0].n_mol = localMol;
1405
1406	<	strcpy( checkPointMsg, "Passed nlocal consistency check." );
1406	>	strcpy(checkPointMsg, "Passed nlocal consistency check.");
1407		MPIcheckPoint();
1408		}
1409	<
1409	>
1410		#endif // is_mpi
1411
1412
1413	<	void SimSetup::makeSysArrays( void ){
1414	<	int i, j, k, l;
1413	>	void SimSetup::makeSysArrays(void){
1414	>
1415	>	#ifndef IS_MPI
1416	>	int k, j;
1417	>	#endif // is_mpi
1418	>	int i, l;
1419
1420		Atom** the_atoms;
1421		Molecule* the_molecules;
1292	–	Exclude** the_excludes;
1422
1423	<
1295	<	for(l=0; l<nInfo; l++){
1296	<
1423	>	for (l = 0; l < nInfo; l++){
1424		// create the atom and short range interaction arrays
1425	<
1426	<	the_atoms = new Atom*[info[l].n_atoms];
1425	>
1426	>	the_atoms = new Atom * [info[l].n_atoms];
1427		the_molecules = new Molecule[info[l].n_mol];
1428		int molIndex;
1429
1430		// initialize the molecule's stampID's
1431	<
1431	>
1432		#ifdef IS_MPI
1433	<
1434	<
1433	>
1434	>
1435		molIndex = 0;
1436	<	for(i=0; i<mpiSim->getTotNmol(); i++){
1437	<
1438	<	if(mol2proc[i] == worldRank ){
1439	<	the_molecules[molIndex].setStampID( molCompType[i] );
1440	<	the_molecules[molIndex].setMyIndex( molIndex );
1441	<	the_molecules[molIndex].setGlobalIndex( i );
1315	<	molIndex++;
1436	>	for (i = 0; i < mpiSim->getTotNmol(); i++){
1437	>	if (mol2proc[i] == worldRank){
1438	>	the_molecules[molIndex].setStampID(molCompType[i]);
1439	>	the_molecules[molIndex].setMyIndex(molIndex);
1440	>	the_molecules[molIndex].setGlobalIndex(i);
1441	>	molIndex++;
1442		}
1443		}
1444	<
1444	>
1445		#else // is_mpi
1446	<
1446	>
1447		molIndex = 0;
1448		globalAtomIndex = 0;
1449	<	for(i=0; i<n_components; i++){
1450	<	for(j=0; j<components_nmol[i]; j++ ){
1451	<	the_molecules[molIndex].setStampID( i );
1452	<	the_molecules[molIndex].setMyIndex( molIndex );
1453	<	the_molecules[molIndex].setGlobalIndex( molIndex );
1454	<	for (k = 0; k < comp_stamps[i]->getNAtoms(); k++) {
1455	<	info[l].molMembershipArray[globalAtomIndex] = molIndex;
1456	<	globalAtomIndex++;
1457	<	}
1458	<	molIndex++;
1449	>	for (i = 0; i < n_components; i++){
1450	>	for (j = 0; j < components_nmol[i]; j++){
1451	>	the_molecules[molIndex].setStampID(i);
1452	>	the_molecules[molIndex].setMyIndex(molIndex);
1453	>	the_molecules[molIndex].setGlobalIndex(molIndex);
1454	>	for (k = 0; k < comp_stamps[i]->getNAtoms(); k++){
1455	>	info[l].molMembershipArray[globalAtomIndex] = molIndex;
1456	>	globalAtomIndex++;
1457	>	}
1458	>	molIndex++;
1459		}
1460		}
1335	–
1336	–
1337	–	#endif // is_mpi
1461
1462
1463	<	if( info[l].n_SRI ){
1341	<
1342	<	Exclude::createArray(info[l].n_SRI);
1343	<	the_excludes = new Exclude*[info[l].n_SRI];
1344	<	for( int ex=0; ex<info[l].n_SRI; ex++){
1345	<	the_excludes[ex] = new Exclude(ex);
1346	<	}
1347	<	info[l].globalExcludes = new int;
1348	<	info[l].n_exclude = info[l].n_SRI;
1349	<	}
1350	<	else{
1351	<
1352	<	Exclude::createArray( 1 );
1353	<	the_excludes = new Exclude*;
1354	<	the_excludes[0] = new Exclude(0);
1355	<	the_excludes[0]->setPair( 0,0 );
1356	<	info[l].globalExcludes = new int;
1357	<	info[l].globalExcludes[0] = 0;
1358	<	info[l].n_exclude = 0;
1359	<	}
1463	>	#endif // is_mpi
1464
1465	+	info[l].globalExcludes = new int;
1466	+	info[l].globalExcludes[0] = 0;
1467	+
1468		// set the arrays into the SimInfo object
1469
1470		info[l].atoms = the_atoms;
1471		info[l].molecules = the_molecules;
1472		info[l].nGlobalExcludes = 0;
1366	–	info[l].excludes = the_excludes;
1473
1474	<	the_ff->setSimInfo( info );
1369	<
1474	>	the_ff->setSimInfo(info);
1475		}
1476		}
1477
1478	<	void SimSetup::makeIntegrator( void ){
1374	<
1478	>	void SimSetup::makeIntegrator(void){
1479		int k;
1480
1481	<	NVT<RealIntegrator>*  myNVT = NULL;
1482	<	NPTi<RealIntegrator>* myNPTi = NULL;
1483	<	NPTf<RealIntegrator>* myNPTf = NULL;
1484	<	NPTim<RealIntegrator>* myNPTim = NULL;
1485	<	NPTfm<RealIntegrator>* myNPTfm = NULL;
1486	<
1487	<	for(k=0; k<nInfo; k++){
1488	<
1489	<	switch( ensembleCase ){
1490	<
1491	<	case NVE_ENS:
1492	<	if (globals->haveZconstraints()){
1493	<	setupZConstraint(info[k]);
1494	<	new ZConstraint<NVE<RealIntegrator> >( &(info[k]), the_ff );
1495	<	}
1481	>	NVE<RealIntegrator>* myNVE = NULL;
1482	>	NVT<RealIntegrator>* myNVT = NULL;
1483	>	NPTi<NPT<RealIntegrator> >* myNPTi = NULL;
1484	>	NPTf<NPT<RealIntegrator> >* myNPTf = NULL;
1485	>	NPTxyz<NPT<RealIntegrator> >* myNPTxyz = NULL;
1486	>
1487	>	for (k = 0; k < nInfo; k++){
1488	>	switch (ensembleCase){
1489	>	case NVE_ENS:
1490	>	if (globals->haveZconstraints()){
1491	>	setupZConstraint(info[k]);
1492	>	myNVE = new ZConstraint<NVE<RealIntegrator> >(&(info[k]), the_ff);
1493	>	}
1494	>	else{
1495	>	myNVE = new NVE<RealIntegrator>(&(info[k]), the_ff);
1496	>	}
1497	>
1498	>	info->the_integrator = myNVE;
1499	>	break;
1500
1501	<	else
1502	<	new NVE<RealIntegrator>( &(info[k]), the_ff );
1503	<	break;
1504	<
1505	<	case NVT_ENS:
1506	<	if (globals->haveZconstraints()){
1507	<	setupZConstraint(info[k]);
1400	<	myNVT = new ZConstraint<NVT<RealIntegrator> >( &(info[k]), the_ff );
1401	<	}
1402	<	else
1403	<	myNVT = new NVT<RealIntegrator>( &(info[k]), the_ff );
1501	>	case NVT_ENS:
1502	>	if (globals->haveZconstraints()){
1503	>	setupZConstraint(info[k]);
1504	>	myNVT = new ZConstraint<NVT<RealIntegrator> >(&(info[k]), the_ff);
1505	>	}
1506	>	else
1507	>	myNVT = new NVT<RealIntegrator>(&(info[k]), the_ff);
1508
1509		myNVT->setTargetTemp(globals->getTargetTemp());
1510	<
1511	<	if (globals->haveTauThermostat())
1510	>
1511	>	if (globals->haveTauThermostat())
1512		myNVT->setTauThermostat(globals->getTauThermostat());
1513	<
1514	<	else {
1515	<	sprintf( painCave.errMsg,
1516	<	"SimSetup error: If you use the NVT\n"
1413	<	"    ensemble, you must set tauThermostat.\n");
1513	>	else{
1514	>	sprintf(painCave.errMsg,
1515	>	"SimSetup error: If you use the NVT\n"
1516	>	"\tensemble, you must set tauThermostat.\n");
1517		painCave.isFatal = 1;
1518		simError();
1519		}
1520	+
1521	+	info->the_integrator = myNVT;
1522		break;
1418	–
1419	–	case NPTi_ENS:
1420	–	if (globals->haveZconstraints()){
1421	–	setupZConstraint(info[k]);
1422	–	myNPTi = new ZConstraint<NPTi<RealIntegrator> >( &(info[k]), the_ff );
1423	–	}
1424	–	else
1425	–	myNPTi = new NPTi<RealIntegrator>( &(info[k]), the_ff );
1523
1524	<	myNPTi->setTargetTemp( globals->getTargetTemp() );
1525	<
1526	<	if (globals->haveTargetPressure())
1527	<	myNPTi->setTargetPressure(globals->getTargetPressure());
1528	<	else {
1529	<	sprintf( painCave.errMsg,
1530	<	"SimSetup error: If you use a constant pressure\n"
1434	<	"    ensemble, you must set targetPressure in the BASS file.\n");
1435	<	painCave.isFatal = 1;
1436	<	simError();
1437	<	}
1438	<
1439	<	if( globals->haveTauThermostat() )
1440	<	myNPTi->setTauThermostat( globals->getTauThermostat() );
1441	<	else{
1442	<	sprintf( painCave.errMsg,
1443	<	"SimSetup error: If you use an NPT\n"
1444	<	"    ensemble, you must set tauThermostat.\n");
1445	<	painCave.isFatal = 1;
1446	<	simError();
1447	<	}
1448	<
1449	<	if( globals->haveTauBarostat() )
1450	<	myNPTi->setTauBarostat( globals->getTauBarostat() );
1451	<	else{
1452	<	sprintf( painCave.errMsg,
1453	<	"SimSetup error: If you use an NPT\n"
1454	<	"    ensemble, you must set tauBarostat.\n");
1455	<	painCave.isFatal = 1;
1456	<	simError();
1457	<	}
1458	<	break;
1459	<
1460	<	case NPTf_ENS:
1461	<	if (globals->haveZconstraints()){
1462	<	setupZConstraint(info[k]);
1463	<	myNPTf = new ZConstraint<NPTf<RealIntegrator> >( &(info[k]), the_ff );
1464	<	}
1465	<	else
1466	<	myNPTf = new NPTf<RealIntegrator>( &(info[k]), the_ff );
1524	>	case NPTi_ENS:
1525	>	if (globals->haveZconstraints()){
1526	>	setupZConstraint(info[k]);
1527	>	myNPTi = new ZConstraint<NPTi<NPT <RealIntegrator> > >(&(info[k]), the_ff);
1528	>	}
1529	>	else
1530	>	myNPTi = new NPTi<NPT<RealIntegrator> >(&(info[k]), the_ff);
1531
1532	<	myNPTf->setTargetTemp( globals->getTargetTemp());
1533	<
1534	<	if (globals->haveTargetPressure())
1535	<	myNPTf->setTargetPressure(globals->getTargetPressure());
1536	<	else {
1537	<	sprintf( painCave.errMsg,
1532	>	myNPTi->setTargetTemp(globals->getTargetTemp());
1533	>
1534	>	if (globals->haveTargetPressure())
1535	>	myNPTi->setTargetPressure(globals->getTargetPressure());
1536	>	else{
1537	>	sprintf(painCave.errMsg,
1538		"SimSetup error: If you use a constant pressure\n"
1539	<	"    ensemble, you must set targetPressure in the BASS file.\n");
1540	<	painCave.isFatal = 1;
1541	<	simError();
1542	<	}
1543	<
1544	<	if( globals->haveTauThermostat() )
1545	<	myNPTf->setTauThermostat( globals->getTauThermostat() );
1546	<	else{
1547	<	sprintf( painCave.errMsg,
1484	<	"SimSetup error: If you use an NPT\n"
1485	<	"    ensemble, you must set tauThermostat.\n");
1486	<	painCave.isFatal = 1;
1487	<	simError();
1488	<	}
1489	<
1490	<	if( globals->haveTauBarostat() )
1491	<	myNPTf->setTauBarostat( globals->getTauBarostat() );
1492	<	else{
1493	<	sprintf( painCave.errMsg,
1539	>	"\tensemble, you must set targetPressure in the BASS file.\n");
1540	>	painCave.isFatal = 1;
1541	>	simError();
1542	>	}
1543	>
1544	>	if (globals->haveTauThermostat())
1545	>	myNPTi->setTauThermostat(globals->getTauThermostat());
1546	>	else{
1547	>	sprintf(painCave.errMsg,
1548		"SimSetup error: If you use an NPT\n"
1549	<	"    ensemble, you must set tauBarostat.\n");
1550	<	painCave.isFatal = 1;
1551	<	simError();
1552	<	}
1499	<	break;
1500	<
1501	<	case NPTim_ENS:
1502	<	if (globals->haveZconstraints()){
1503	<	setupZConstraint(info[k]);
1504	<	myNPTim = new ZConstraint<NPTim<RealIntegrator> >( &(info[k]), the_ff );
1505	<	}
1506	<	else
1507	<	myNPTim = new NPTim<RealIntegrator>( &(info[k]), the_ff );
1549	>	"\tensemble, you must set tauThermostat.\n");
1550	>	painCave.isFatal = 1;
1551	>	simError();
1552	>	}
1553
1554	<	myNPTim->setTargetTemp( globals->getTargetTemp());
1555	<
1556	<	if (globals->haveTargetPressure())
1557	<	myNPTim->setTargetPressure(globals->getTargetPressure());
1513	<	else {
1514	<	sprintf( painCave.errMsg,
1515	<	"SimSetup error: If you use a constant pressure\n"
1516	<	"    ensemble, you must set targetPressure in the BASS file.\n");
1517	<	painCave.isFatal = 1;
1518	<	simError();
1519	<	}
1520	<
1521	<	if( globals->haveTauThermostat() )
1522	<	myNPTim->setTauThermostat( globals->getTauThermostat() );
1523	<	else{
1524	<	sprintf( painCave.errMsg,
1554	>	if (globals->haveTauBarostat())
1555	>	myNPTi->setTauBarostat(globals->getTauBarostat());
1556	>	else{
1557	>	sprintf(painCave.errMsg,
1558		"SimSetup error: If you use an NPT\n"
1559	<	"    ensemble, you must set tauThermostat.\n");
1560	<	painCave.isFatal = 1;
1561	<	simError();
1562	<	}
1530	<
1531	<	if( globals->haveTauBarostat() )
1532	<	myNPTim->setTauBarostat( globals->getTauBarostat() );
1533	<	else{
1534	<	sprintf( painCave.errMsg,
1535	<	"SimSetup error: If you use an NPT\n"
1536	<	"    ensemble, you must set tauBarostat.\n");
1537	<	painCave.isFatal = 1;
1538	<	simError();
1539	<	}
1540	<	break;
1541	<
1542	<	case NPTfm_ENS:
1543	<	if (globals->haveZconstraints()){
1544	<	setupZConstraint(info[k]);
1545	<	myNPTfm = new ZConstraint<NPTfm<RealIntegrator> >( &(info[k]), the_ff );
1546	<	}
1547	<	else
1548	<	myNPTfm = new NPTfm<RealIntegrator>( &(info[k]), the_ff );
1559	>	"\tensemble, you must set tauBarostat.\n");
1560	>	painCave.isFatal = 1;
1561	>	simError();
1562	>	}
1563
1564	<	myNPTfm->setTargetTemp( globals->getTargetTemp());
1564	>	info->the_integrator = myNPTi;
1565	>	break;
1566
1567	<	if (globals->haveTargetPressure())
1568	<	myNPTfm->setTargetPressure(globals->getTargetPressure());
1569	<	else {
1570	<	sprintf( painCave.errMsg,
1571	<	"SimSetup error: If you use a constant pressure\n"
1572	<	"    ensemble, you must set targetPressure in the BASS file.\n");
1573	<	painCave.isFatal = 1;
1559	<	simError();
1560	<	}
1567	>	case NPTf_ENS:
1568	>	if (globals->haveZconstraints()){
1569	>	setupZConstraint(info[k]);
1570	>	myNPTf = new ZConstraint<NPTf<NPT <RealIntegrator> > >(&(info[k]), the_ff);
1571	>	}
1572	>	else
1573	>	myNPTf = new NPTf<NPT <RealIntegrator> >(&(info[k]), the_ff);
1574
1575	<	if( globals->haveTauThermostat() )
1563	<	myNPTfm->setTauThermostat( globals->getTauThermostat() );
1564	<	else{
1565	<	sprintf( painCave.errMsg,
1566	<	"SimSetup error: If you use an NPT\n"
1567	<	"    ensemble, you must set tauThermostat.\n");
1568	<	painCave.isFatal = 1;
1569	<	simError();
1570	<	}
1575	>	myNPTf->setTargetTemp(globals->getTargetTemp());
1576
1577	<	if( globals->haveTauBarostat() )
1578	<	myNPTfm->setTauBarostat( globals->getTauBarostat() );
1579	<	else{
1580	<	sprintf( painCave.errMsg,
1577	>	if (globals->haveTargetPressure())
1578	>	myNPTf->setTargetPressure(globals->getTargetPressure());
1579	>	else{
1580	>	sprintf(painCave.errMsg,
1581	>	"SimSetup error: If you use a constant pressure\n"
1582	>	"\tensemble, you must set targetPressure in the BASS file.\n");
1583	>	painCave.isFatal = 1;
1584	>	simError();
1585	>	}
1586	>
1587	>	if (globals->haveTauThermostat())
1588	>	myNPTf->setTauThermostat(globals->getTauThermostat());
1589	>
1590	>	else{
1591	>	sprintf(painCave.errMsg,
1592		"SimSetup error: If you use an NPT\n"
1593	<	"    ensemble, you must set tauBarostat.\n");
1593	>	"\tensemble, you must set tauThermostat.\n");
1594	>	painCave.isFatal = 1;
1595	>	simError();
1596	>	}
1597	>
1598	>	if (globals->haveTauBarostat())
1599	>	myNPTf->setTauBarostat(globals->getTauBarostat());
1600	>
1601	>	else{
1602	>	sprintf(painCave.errMsg,
1603	>	"SimSetup error: If you use an NPT\n"
1604	>	"\tensemble, you must set tauBarostat.\n");
1605	>	painCave.isFatal = 1;
1606	>	simError();
1607	>	}
1608	>
1609	>	info->the_integrator = myNPTf;
1610	>	break;
1611	>
1612	>	case NPTxyz_ENS:
1613	>	if (globals->haveZconstraints()){
1614	>	setupZConstraint(info[k]);
1615	>	myNPTxyz = new ZConstraint<NPTxyz<NPT <RealIntegrator> > >(&(info[k]), the_ff);
1616	>	}
1617	>	else
1618	>	myNPTxyz = new NPTxyz<NPT <RealIntegrator> >(&(info[k]), the_ff);
1619	>
1620	>	myNPTxyz->setTargetTemp(globals->getTargetTemp());
1621	>
1622	>	if (globals->haveTargetPressure())
1623	>	myNPTxyz->setTargetPressure(globals->getTargetPressure());
1624	>	else{
1625	>	sprintf(painCave.errMsg,
1626	>	"SimSetup error: If you use a constant pressure\n"
1627	>	"\tensemble, you must set targetPressure in the BASS file.\n");
1628	>	painCave.isFatal = 1;
1629	>	simError();
1630	>	}
1631	>
1632	>	if (globals->haveTauThermostat())
1633	>	myNPTxyz->setTauThermostat(globals->getTauThermostat());
1634	>	else{
1635	>	sprintf(painCave.errMsg,
1636	>	"SimSetup error: If you use an NPT\n"
1637	>	"\tensemble, you must set tauThermostat.\n");
1638	>	painCave.isFatal = 1;
1639	>	simError();
1640	>	}
1641	>
1642	>	if (globals->haveTauBarostat())
1643	>	myNPTxyz->setTauBarostat(globals->getTauBarostat());
1644	>	else{
1645	>	sprintf(painCave.errMsg,
1646	>	"SimSetup error: If you use an NPT\n"
1647	>	"\tensemble, you must set tauBarostat.\n");
1648	>	painCave.isFatal = 1;
1649	>	simError();
1650	>	}
1651	>
1652	>	info->the_integrator = myNPTxyz;
1653	>	break;
1654	>
1655	>	default:
1656	>	sprintf(painCave.errMsg,
1657	>	"SimSetup Error. Unrecognized ensemble in case statement.\n");
1658		painCave.isFatal = 1;
1659		simError();
1580	–	}
1581	–	break;
1582	–
1583	–	default:
1584	–	sprintf( painCave.errMsg,
1585	–	"SimSetup Error. Unrecognized ensemble in case statement.\n");
1586	–	painCave.isFatal = 1;
1587	–	simError();
1660		}
1661		}
1662		}
1663
1664	<	void SimSetup::initFortran( void ){
1593	<
1664	>	void SimSetup::initFortran(void){
1665		info[0].refreshSim();
1666	<
1667	<	if( !strcmp( info[0].mixingRule, "standard") ){
1668	<	the_ff->initForceField( LB_MIXING_RULE );
1666	>
1667	>	if (!strcmp(info[0].mixingRule, "standard")){
1668	>	the_ff->initForceField(LB_MIXING_RULE);
1669		}
1670	<	else if( !strcmp( info[0].mixingRule, "explicit") ){
1671	<	the_ff->initForceField( EXPLICIT_MIXING_RULE );
1670	>	else if (!strcmp(info[0].mixingRule, "explicit")){
1671	>	the_ff->initForceField(EXPLICIT_MIXING_RULE);
1672		}
1673		else{
1674	<	sprintf( painCave.errMsg,
1675	<	"SimSetup Error: unknown mixing rule -> \"%s\"\n",
1605	<	info[0].mixingRule );
1674	>	sprintf(painCave.errMsg, "SimSetup Error: unknown mixing rule -> \"%s\"\n",
1675	>	info[0].mixingRule);
1676		painCave.isFatal = 1;
1677		simError();
1678		}
1679
1680
1681		#ifdef IS_MPI
1682	<	strcpy( checkPointMsg,
1613	<	"Successfully intialized the mixingRule for Fortran." );
1682	>	strcpy(checkPointMsg, "Successfully intialized the mixingRule for Fortran.");
1683		MPIcheckPoint();
1684		#endif // is_mpi
1616	–
1685		}
1686
1687	<	void SimSetup::setupZConstraint(SimInfo& theInfo)
1620	<	{
1687	>	void SimSetup::setupZConstraint(SimInfo& theInfo){
1688		int nZConstraints;
1689		ZconStamp** zconStamp;
1690
1691	<	if(globals->haveZconstraintTime()){
1625	<
1691	>	if (globals->haveZconstraintTime()){
1692		//add sample time of z-constraint  into SimInfo's property list
1693		DoubleData* zconsTimeProp = new DoubleData();
1694		zconsTimeProp->setID(ZCONSTIME_ID);
#	Line 1630 | Line 1696 | void SimSetup::setupZConstraint(SimInfo& theInfo)
1696		theInfo.addProperty(zconsTimeProp);
1697		}
1698		else{
1699	<	sprintf( painCave.errMsg,
1700	<	"ZConstraint error: If you use an ZConstraint\n"
1701	<	" , you must set sample time.\n");
1699	>	sprintf(painCave.errMsg,
1700	>	"ZConstraint error: If you use a ZConstraint,\n"
1701	>	"\tyou must set zconsTime.\n");
1702		painCave.isFatal = 1;
1703	<	simError();
1703	>	simError();
1704		}
1705
1706		//push zconsTol into siminfo, if user does not specify
1707		//value for zconsTol, a default value will be used
1708		DoubleData* zconsTol = new DoubleData();
1709		zconsTol->setID(ZCONSTOL_ID);
1710	<	if(globals->haveZconsTol()){
1710	>	if (globals->haveZconsTol()){
1711		zconsTol->setData(globals->getZconsTol());
1712		}
1713		else{
1714	<	double defaultZConsTol = 0.01;
1715	<	sprintf( painCave.errMsg,
1716	<	"ZConstraint Waring: Tolerance for z-constraint methodl is not specified\n"
1717	<	" , default value %f is used.\n", defaultZConsTol);
1714	>	double defaultZConsTol = 0.01;
1715	>	sprintf(painCave.errMsg,
1716	>	"ZConstraint Warning: Tolerance for z-constraint method is not specified.\n"
1717	>	"\tOOPSE will use a default value of %f.\n"
1718	>	"\tTo set the tolerance, use the zconsTol variable.\n",
1719	>	defaultZConsTol);
1720		painCave.isFatal = 0;
1721		simError();
1722
#	Line 1656 | Line 1724 | void SimSetup::setupZConstraint(SimInfo& theInfo)
1724		}
1725		theInfo.addProperty(zconsTol);
1726
1727	<	//set Force Substraction Policy
1728	<	StringData* zconsForcePolicy =  new StringData();
1727	>	//set Force Subtraction Policy
1728	>	StringData* zconsForcePolicy = new StringData();
1729		zconsForcePolicy->setID(ZCONSFORCEPOLICY_ID);
1730	<
1731	<	if(globals->haveZconsForcePolicy()){
1730	>
1731	>	if (globals->haveZconsForcePolicy()){
1732		zconsForcePolicy->setData(globals->getZconsForcePolicy());
1733	<	}
1733	>	}
1734		else{
1735	<	sprintf( painCave.errMsg,
1736	<	"ZConstraint Warning: User does not set force substraction policy, "
1737	<	"average force substraction policy is used\n");
1738	<	painCave.isFatal = 0;
1739	<	simError();
1740	<	zconsForcePolicy->setData("BYNUMBER");
1735	>	sprintf(painCave.errMsg,
1736	>	"ZConstraint Warning: No force subtraction policy was set.\n"
1737	>	"\tOOPSE will use PolicyByMass.\n"
1738	>	"\tTo set the policy, use the zconsForcePolicy variable.\n");
1739	>	painCave.isFatal = 0;
1740	>	simError();
1741	>	zconsForcePolicy->setData("BYMASS");
1742		}
1743	<
1744	<	theInfo.addProperty(zconsForcePolicy);
1745	<
1743	>
1744	>	theInfo.addProperty(zconsForcePolicy);
1745	>
1746	>	//set zcons gap
1747	>	DoubleData* zconsGap = new DoubleData();
1748	>	zconsGap->setID(ZCONSGAP_ID);
1749	>
1750	>	if (globals->haveZConsGap()){
1751	>	zconsGap->setData(globals->getZconsGap());
1752	>	theInfo.addProperty(zconsGap);
1753	>	}
1754	>
1755	>	//set zcons fixtime
1756	>	DoubleData* zconsFixtime = new DoubleData();
1757	>	zconsFixtime->setID(ZCONSFIXTIME_ID);
1758	>
1759	>	if (globals->haveZConsFixTime()){
1760	>	zconsFixtime->setData(globals->getZconsFixtime());
1761	>	theInfo.addProperty(zconsFixtime);
1762	>	}
1763	>
1764	>	//set zconsUsingSMD
1765	>	IntData* zconsUsingSMD = new IntData();
1766	>	zconsUsingSMD->setID(ZCONSUSINGSMD_ID);
1767	>
1768	>	if (globals->haveZConsUsingSMD()){
1769	>	zconsUsingSMD->setData(globals->getZconsUsingSMD());
1770	>	theInfo.addProperty(zconsUsingSMD);
1771	>	}
1772	>
1773		//Determine the name of ouput file and add it into SimInfo's property list
1774		//Be careful, do not use inFileName, since it is a pointer which
1775		//point to a string at master node, and slave nodes do not contain that string
1776	<
1776	>
1777		string zconsOutput(theInfo.finalName);
1778	<
1778	>
1779		zconsOutput = zconsOutput.substr(0, zconsOutput.rfind(".")) + ".fz";
1780	<
1780	>
1781		StringData* zconsFilename = new StringData();
1782		zconsFilename->setID(ZCONSFILENAME_ID);
1783		zconsFilename->setData(zconsOutput);
1784	<
1784	>
1785		theInfo.addProperty(zconsFilename);
1786	<
1786	>
1787		//setup index, pos and other parameters of z-constraint molecules
1788		nZConstraints = globals->getNzConstraints();
1789		theInfo.nZconstraints = nZConstraints;
#	Line 1697 | Line 1793 | void SimSetup::setupZConstraint(SimInfo& theInfo)
1793
1794		ZConsParaData* zconsParaData = new ZConsParaData();
1795		zconsParaData->setID(ZCONSPARADATA_ID);
1796	<
1797	<	for(int i = 0; i < nZConstraints; i++){
1796	>
1797	>	for (int i = 0; i < nZConstraints; i++){
1798		tempParaItem.havingZPos = zconStamp[i]->haveZpos();
1799		tempParaItem.zPos = zconStamp[i]->getZpos();
1800		tempParaItem.zconsIndex = zconStamp[i]->getMolIndex();
1801		tempParaItem.kRatio = zconStamp[i]->getKratio();
1802	<
1802	>	tempParaItem.havingCantVel = zconStamp[i]->haveCantVel();
1803	>	tempParaItem.cantVel = zconStamp[i]->getCantVel();
1804		zconsParaData->addItem(tempParaItem);
1805		}
1806
1807	+	//check the uniqueness of index
1808	+	if(!zconsParaData->isIndexUnique()){
1809	+	sprintf(painCave.errMsg,
1810	+	"ZConstraint Error: molIndex is not unique!\n");
1811	+	painCave.isFatal = 1;
1812	+	simError();
1813	+	}
1814	+
1815		//sort the parameters by index of molecules
1816		zconsParaData->sortByIndex();
1817
1818		//push data into siminfo, therefore, we can retrieve later
1819		theInfo.addProperty(zconsParaData);
1715	–
1820		}
1821	+
1822	+	void SimSetup::makeMinimizer(){
1823	+
1824	+	OOPSEMinimizer* myOOPSEMinimizer;
1825	+	MinimizerParameterSet* param;
1826	+	char minimizerName[100];
1827	+
1828	+	for (int i = 0; i < nInfo; i++){
1829	+
1830	+	//prepare parameter set for minimizer
1831	+	param = new MinimizerParameterSet();
1832	+	param->setDefaultParameter();
1833	+
1834	+	if (globals->haveMinimizer()){
1835	+	param->setFTol(globals->getMinFTol());
1836	+	}
1837	+
1838	+	if (globals->haveMinGTol()){
1839	+	param->setGTol(globals->getMinGTol());
1840	+	}
1841	+
1842	+	if (globals->haveMinMaxIter()){
1843	+	param->setMaxIteration(globals->getMinMaxIter());
1844	+	}
1845	+
1846	+	if (globals->haveMinWriteFrq()){
1847	+	param->setMaxIteration(globals->getMinMaxIter());
1848	+	}
1849	+
1850	+	if (globals->haveMinWriteFrq()){
1851	+	param->setWriteFrq(globals->getMinWriteFrq());
1852	+	}
1853	+
1854	+	if (globals->haveMinStepSize()){
1855	+	param->setStepSize(globals->getMinStepSize());
1856	+	}
1857	+
1858	+	if (globals->haveMinLSMaxIter()){
1859	+	param->setLineSearchMaxIteration(globals->getMinLSMaxIter());
1860	+	}
1861	+
1862	+	if (globals->haveMinLSTol()){
1863	+	param->setLineSearchTol(globals->getMinLSTol());
1864	+	}
1865	+
1866	+	strcpy(minimizerName, globals->getMinimizer());
1867	+
1868	+	if (!strcasecmp(minimizerName, "CG")){
1869	+	myOOPSEMinimizer = new PRCGMinimizer(&(info[i]), the_ff, param);
1870	+	}
1871	+	else if (!strcasecmp(minimizerName, "SD")){
1872	+	//myOOPSEMinimizer = MinimizerFactory.creatMinimizer("", &(info[i]), the_ff, param);
1873	+	myOOPSEMinimizer = new SDMinimizer(&(info[i]), the_ff, param);
1874	+	}
1875	+	else{
1876	+	sprintf(painCave.errMsg,
1877	+	"SimSetup error: Unrecognized Minimizer, use Conjugate Gradient \n");
1878	+	painCave.isFatal = 0;
1879	+	simError();
1880	+
1881	+	myOOPSEMinimizer = new PRCGMinimizer(&(info[i]), the_ff, param);
1882	+	}
1883	+	info[i].the_integrator = myOOPSEMinimizer;
1884	+
1885	+	//store the minimizer into simInfo
1886	+	info[i].the_minimizer = myOOPSEMinimizer;
1887	+	info[i].has_minimizer = true;
1888	+	}
1889	+
1890	+	}

Diff Legend

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