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

Diff Legend

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