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 693 by tim, Wed Aug 13 19:21:53 2003 UTC vs.
Revision 811 by mmeineke, Tue Oct 21 19:33:19 2003 UTC

#	Line 3 | Line 3
3		#include <iostream>
4		#include <cmath>
5		#include <string>
6	+	#include <sprng.h>
7
8		#include "SimSetup.hpp"
9		#include "ReadWrite.hpp"
#	Line 21 | Line 22
22		#define NVT_ENS        1
23		#define NPTi_ENS       2
24		#define NPTf_ENS       3
24	–	#define NPTim_ENS      4
25	–	#define NPTfm_ENS      5
25
26		#define FF_DUFF 0
27		#define FF_LJ   1
#	Line 31 | Line 30 | SimSetup::SimSetup(){
30		using namespace std;
31
32		SimSetup::SimSetup(){
34	–
33		isInfoArray = 0;
34		nInfo = 1;
35	<
35	>
36		stamps = new MakeStamps();
37		globals = new Globals();
38	<
39	<
38	>
39	>
40		#ifdef IS_MPI
41	<	strcpy( checkPointMsg, "SimSetup creation successful" );
41	>	strcpy(checkPointMsg, "SimSetup creation successful");
42		MPIcheckPoint();
43		#endif // IS_MPI
44		}
#	Line 50 | Line 48 | void SimSetup::setSimInfo( SimInfo* the_info, int theN
48		delete globals;
49		}
50
51	<	void SimSetup::setSimInfo( SimInfo* the_info, int theNinfo ) {
52	<	info = the_info;
53	<	nInfo = theNinfo;
54	<	isInfoArray = 1;
51	>	void SimSetup::setSimInfo(SimInfo* the_info, int theNinfo){
52	>	info = the_info;
53	>	nInfo = theNinfo;
54	>	isInfoArray = 1;
55		}
56
57
58	<	void SimSetup::parseFile( char* fileName ){
61	<
58	>	void SimSetup::parseFile(char* fileName){
59		#ifdef IS_MPI
60	<	if( worldRank == 0 ){
60	>	if (worldRank == 0){
61		#endif // is_mpi
62	<
62	>
63		inFileName = fileName;
64	<	set_interface_stamps( stamps, globals );
65	<
64	>	set_interface_stamps(stamps, globals);
65	>
66		#ifdef IS_MPI
67		mpiEventInit();
68		#endif
69
70	<	yacc_BASS( fileName );
70	>	yacc_BASS(fileName);
71
72		#ifdef IS_MPI
73		throwMPIEvent(NULL);
74		}
75	<	else receiveParse();
75	>	else{
76	>	receiveParse();
77	>	}
78		#endif
79
80		}
81
82		#ifdef IS_MPI
83		void SimSetup::receiveParse(void){
84	<
85	<	set_interface_stamps( stamps, globals );
86	<	mpiEventInit();
87	<	MPIcheckPoint();
89	<	mpiEventLoop();
90	<
84	>	set_interface_stamps(stamps, globals);
85	>	mpiEventInit();
86	>	MPIcheckPoint();
87	>	mpiEventLoop();
88		}
89
90		#endif // is_mpi
91
92		void SimSetup::createSim(void){
93
97	–	int i, j, k, globalAtomIndex;
98	–
94		// gather all of the information from the Bass file
95
96		gatherInfo();
#	Line 110 | Line 105 | void SimSetup::createSim(void){
105
106		// initialize the system coordinates
107
108	<	if( !isInfoArray ) initSystemCoords();
108	>	if (!isInfoArray){
109	>	initSystemCoords();
110
111	+	if( !(globals->getUseInitTime()) )
112	+	info[0].currentTime = 0.0;
113	+	}
114	+
115		// make the output filenames
116
117		makeOutNames();
118	<
118	>
119		// make the integrator
120	<
120	>
121		makeIntegrator();
122	<
122	>
123		#ifdef IS_MPI
124		mpiSim->mpiRefresh();
125		#endif
#	Line 127 | Line 127 | void SimSetup::createSim(void){
127		// initialize the Fortran
128
129		initFortran();
130	–
131	–
132	–
130		}
131
132
133	<	void SimSetup::makeMolecules( void ){
134	<
138	<	int k,l;
133	>	void SimSetup::makeMolecules(void){
134	>	int k;
135		int i, j, exI, exJ, tempEx, stampID, atomOffset, excludeOffset;
136		molInit molInfo;
137		DirectionalAtom* dAtom;
#	Line 150 | Line 146 | void SimSetup::makeMolecules( void ){
146		bend_set* theBends;
147		torsion_set* theTorsions;
148
149	<
149	>
150		//init the forceField paramters
151
152		the_ff->readParams();
153
154	<
154	>
155		// init the atoms
156
157		double ux, uy, uz, u, uSqr;
162	–
163	–	for(k=0; k<nInfo; k++){
164	–
165	–	the_ff->setSimInfo( &(info[k]) );
158
159	+	for (k = 0; k < nInfo; k++){
160	+	the_ff->setSimInfo(&(info[k]));
161	+
162		atomOffset = 0;
163		excludeOffset = 0;
164	<	for(i=0; i<info[k].n_mol; i++){
170	<
164	>	for (i = 0; i < info[k].n_mol; i++){
165		stampID = info[k].molecules[i].getStampID();
166
167	<	molInfo.nAtoms    = comp_stamps[stampID]->getNAtoms();
168	<	molInfo.nBonds    = comp_stamps[stampID]->getNBonds();
169	<	molInfo.nBends    = comp_stamps[stampID]->getNBends();
167	>	molInfo.nAtoms = comp_stamps[stampID]->getNAtoms();
168	>	molInfo.nBonds = comp_stamps[stampID]->getNBonds();
169	>	molInfo.nBends = comp_stamps[stampID]->getNBends();
170		molInfo.nTorsions = comp_stamps[stampID]->getNTorsions();
171		molInfo.nExcludes = molInfo.nBonds + molInfo.nBends + molInfo.nTorsions;
172	<
172	>
173		molInfo.myAtoms = &(info[k].atoms[atomOffset]);
174		molInfo.myExcludes = &(info[k].excludes[excludeOffset]);
175	<	molInfo.myBonds = new Bond*[molInfo.nBonds];
176	<	molInfo.myBends = new Bend*[molInfo.nBends];
177	<	molInfo.myTorsions = new Torsion*[molInfo.nTorsions];
175	>	molInfo.myBonds = new Bond * [molInfo.nBonds];
176	>	molInfo.myBends = new Bend * [molInfo.nBends];
177	>	molInfo.myTorsions = new Torsion * [molInfo.nTorsions];
178
179		theBonds = new bond_pair[molInfo.nBonds];
180		theBends = new bend_set[molInfo.nBends];
181		theTorsions = new torsion_set[molInfo.nTorsions];
182	<
182	>
183		// make the Atoms
184	<
185	<	for(j=0; j<molInfo.nAtoms; j++){
186	<
187	<	currentAtom = comp_stamps[stampID]->getAtom( j );
188	<	if( currentAtom->haveOrientation() ){
189	<
190	<	dAtom = new DirectionalAtom( (j + atomOffset),
191	<	info[k].getConfiguration() );
192	<	info[k].n_oriented++;
193	<	molInfo.myAtoms[j] = dAtom;
194	<
195	<	ux = currentAtom->getOrntX();
196	<	uy = currentAtom->getOrntY();
197	<	uz = currentAtom->getOrntZ();
198	<
199	<	uSqr = (ux * ux) + (uy * uy) + (uz * uz);
200	<
201	<	u = sqrt( uSqr );
202	<	ux = ux / u;
203	<	uy = uy / u;
204	<	uz = uz / u;
205	<
206	<	dAtom->setSUx( ux );
207	<	dAtom->setSUy( uy );
208	<	dAtom->setSUz( uz );
209	<	}
210	<	else{
211	<	molInfo.myAtoms[j] = new GeneralAtom( (j + atomOffset),
212	<	info[k].getConfiguration() );
213	<	}
220	<	molInfo.myAtoms[j]->setType( currentAtom->getType() );
221	<
184	>
185	>	for (j = 0; j < molInfo.nAtoms; j++){
186	>	currentAtom = comp_stamps[stampID]->getAtom(j);
187	>	if (currentAtom->haveOrientation()){
188	>	dAtom = new DirectionalAtom((j + atomOffset),
189	>	info[k].getConfiguration());
190	>	info[k].n_oriented++;
191	>	molInfo.myAtoms[j] = dAtom;
192	>
193	>	ux = currentAtom->getOrntX();
194	>	uy = currentAtom->getOrntY();
195	>	uz = currentAtom->getOrntZ();
196	>
197	>	uSqr = (ux * ux) + (uy * uy) + (uz * uz);
198	>
199	>	u = sqrt(uSqr);
200	>	ux = ux / u;
201	>	uy = uy / u;
202	>	uz = uz / u;
203	>
204	>	dAtom->setSUx(ux);
205	>	dAtom->setSUy(uy);
206	>	dAtom->setSUz(uz);
207	>	}
208	>	else{
209	>	molInfo.myAtoms[j] = new GeneralAtom((j + atomOffset),
210	>	info[k].getConfiguration());
211	>	}
212	>	molInfo.myAtoms[j]->setType(currentAtom->getType());
213	>
214		#ifdef IS_MPI
215	<
216	<	molInfo.myAtoms[j]->setGlobalIndex( globalIndex[j+atomOffset] );
217	<
215	>
216	>	molInfo.myAtoms[j]->setGlobalIndex(globalIndex[j + atomOffset]);
217	>
218		#endif // is_mpi
219		}
220	<
221	<	// make the bonds
222	<	for(j=0; j<molInfo.nBonds; j++){
223	<
224	<	currentBond = comp_stamps[stampID]->getBond( j );
225	<	theBonds[j].a = currentBond->getA() + atomOffset;
226	<	theBonds[j].b = currentBond->getB() + atomOffset;
227	<
228	<	exI = theBonds[j].a;
229	<	exJ = theBonds[j].b;
230	<
231	<	// exclude_I must always be the smaller of the pair
232	<	if( exI > exJ ){
233	<	tempEx = exI;
234	<	exI = exJ;
235	<	exJ = tempEx;
244	<	}
220	>
221	>	// make the bonds
222	>	for (j = 0; j < molInfo.nBonds; j++){
223	>	currentBond = comp_stamps[stampID]->getBond(j);
224	>	theBonds[j].a = currentBond->getA() + atomOffset;
225	>	theBonds[j].b = currentBond->getB() + atomOffset;
226	>
227	>	exI = theBonds[j].a;
228	>	exJ = theBonds[j].b;
229	>
230	>	// exclude_I must always be the smaller of the pair
231	>	if (exI > exJ){
232	>	tempEx = exI;
233	>	exI = exJ;
234	>	exJ = tempEx;
235	>	}
236		#ifdef IS_MPI
237	<	tempEx = exI;
238	<	exI = info[k].atoms[tempEx]->getGlobalIndex() + 1;
239	<	tempEx = exJ;
240	<	exJ = info[k].atoms[tempEx]->getGlobalIndex() + 1;
241	<
242	<	info[k].excludes[j+excludeOffset]->setPair( exI, exJ );
237	>	tempEx = exI;
238	>	exI = info[k].atoms[tempEx]->getGlobalIndex() + 1;
239	>	tempEx = exJ;
240	>	exJ = info[k].atoms[tempEx]->getGlobalIndex() + 1;
241	>
242	>	info[k].excludes[j + excludeOffset]->setPair(exI, exJ);
243		#else  // isn't MPI
244	<
245	<	info[k].excludes[j+excludeOffset]->setPair( (exI+1), (exJ+1) );
244	>
245	>	info[k].excludes[j + excludeOffset]->setPair((exI + 1), (exJ + 1));
246		#endif  //is_mpi
247		}
248		excludeOffset += molInfo.nBonds;
249	<
250	<	//make the bends
251	<	for(j=0; j<molInfo.nBends; j++){
252	<
253	<	currentBend = comp_stamps[stampID]->getBend( j );
254	<	theBends[j].a = currentBend->getA() + atomOffset;
255	<	theBends[j].b = currentBend->getB() + atomOffset;
256	<	theBends[j].c = currentBend->getC() + atomOffset;
257	<
258	<	if( currentBend->haveExtras() ){
259	<
260	<	extras = currentBend->getExtras();
261	<	current_extra = extras;
262	<
263	<	while( current_extra != NULL ){
264	<	if( !strcmp( current_extra->getlhs(), "ghostVectorSource" )){
265	<
266	<	switch( current_extra->getType() ){
267	<
268	<	case 0:
269	<	theBends[j].ghost =
270	<	current_extra->getInt() + atomOffset;
271	<	theBends[j].isGhost = 1;
272	<	break;
273	<
274	<	case 1:
275	<	theBends[j].ghost =
276	<	(int)current_extra->getDouble() + atomOffset;
277	<	theBends[j].isGhost = 1;
278	<	break;
279	<
280	<	default:
281	<	sprintf( painCave.errMsg,
282	<	"SimSetup Error: ghostVectorSource was neither a "
283	<	"double nor an int.\n"
284	<	"-->Bend[%d] in %s\n",
285	<	j, comp_stamps[stampID]->getID() );
286	<	painCave.isFatal = 1;
287	<	simError();
288	<	}
289	<	}
290	<
291	<	else{
292	<
293	<	sprintf( painCave.errMsg,
294	<	"SimSetup Error: unhandled bend assignment:\n"
295	<	"    -->%s in Bend[%d] in %s\n",
296	<	current_extra->getlhs(),
297	<	j, comp_stamps[stampID]->getID() );
298	<	painCave.isFatal = 1;
299	<	simError();
300	<	}
301	<
302	<	current_extra = current_extra->getNext();
303	<	}
304	<	}
305	<
306	<	if( !theBends[j].isGhost ){
307	<
308	<	exI = theBends[j].a;
309	<	exJ = theBends[j].c;
310	<	}
311	<	else{
312	<
322	<	exI = theBends[j].a;
323	<	exJ = theBends[j].b;
324	<	}
325	<
326	<	// exclude_I must always be the smaller of the pair
327	<	if( exI > exJ ){
328	<	tempEx = exI;
329	<	exI = exJ;
330	<	exJ = tempEx;
331	<	}
249	>
250	>	//make the bends
251	>	for (j = 0; j < molInfo.nBends; j++){
252	>	currentBend = comp_stamps[stampID]->getBend(j);
253	>	theBends[j].a = currentBend->getA() + atomOffset;
254	>	theBends[j].b = currentBend->getB() + atomOffset;
255	>	theBends[j].c = currentBend->getC() + atomOffset;
256	>
257	>	if (currentBend->haveExtras()){
258	>	extras = currentBend->getExtras();
259	>	current_extra = extras;
260	>
261	>	while (current_extra != NULL){
262	>	if (!strcmp(current_extra->getlhs(), "ghostVectorSource")){
263	>	switch (current_extra->getType()){
264	>	case 0:
265	>	theBends[j].ghost = current_extra->getInt() + atomOffset;
266	>	theBends[j].isGhost = 1;
267	>	break;
268	>
269	>	case 1:
270	>	theBends[j].ghost = (int) current_extra->getDouble() +
271	>	atomOffset;
272	>	theBends[j].isGhost = 1;
273	>	break;
274	>
275	>	default:
276	>	sprintf(painCave.errMsg,
277	>	"SimSetup Error: ghostVectorSource was neither a "
278	>	"double nor an int.\n"
279	>	"-->Bend[%d] in %s\n",
280	>	j, comp_stamps[stampID]->getID());
281	>	painCave.isFatal = 1;
282	>	simError();
283	>	}
284	>	}
285	>	else{
286	>	sprintf(painCave.errMsg,
287	>	"SimSetup Error: unhandled bend assignment:\n"
288	>	"    -->%s in Bend[%d] in %s\n",
289	>	current_extra->getlhs(), j, comp_stamps[stampID]->getID());
290	>	painCave.isFatal = 1;
291	>	simError();
292	>	}
293	>
294	>	current_extra = current_extra->getNext();
295	>	}
296	>	}
297	>
298	>	if (!theBends[j].isGhost){
299	>	exI = theBends[j].a;
300	>	exJ = theBends[j].c;
301	>	}
302	>	else{
303	>	exI = theBends[j].a;
304	>	exJ = theBends[j].b;
305	>	}
306	>
307	>	// exclude_I must always be the smaller of the pair
308	>	if (exI > exJ){
309	>	tempEx = exI;
310	>	exI = exJ;
311	>	exJ = tempEx;
312	>	}
313		#ifdef IS_MPI
314	<	tempEx = exI;
315	<	exI = info[k].atoms[tempEx]->getGlobalIndex() + 1;
316	<	tempEx = exJ;
317	<	exJ = info[k].atoms[tempEx]->getGlobalIndex() + 1;
318	<
319	<	info[k].excludes[j+excludeOffset]->setPair( exI, exJ );
314	>	tempEx = exI;
315	>	exI = info[k].atoms[tempEx]->getGlobalIndex() + 1;
316	>	tempEx = exJ;
317	>	exJ = info[k].atoms[tempEx]->getGlobalIndex() + 1;
318	>
319	>	info[k].excludes[j + excludeOffset]->setPair(exI, exJ);
320		#else  // isn't MPI
321	<	info[k].excludes[j+excludeOffset]->setPair( (exI+1), (exJ+1) );
321	>	info[k].excludes[j + excludeOffset]->setPair((exI + 1), (exJ + 1));
322		#endif  //is_mpi
323		}
324		excludeOffset += molInfo.nBends;
325	<
326	<	for(j=0; j<molInfo.nTorsions; j++){
327	<
328	<	currentTorsion = comp_stamps[stampID]->getTorsion( j );
329	<	theTorsions[j].a = currentTorsion->getA() + atomOffset;
330	<	theTorsions[j].b = currentTorsion->getB() + atomOffset;
331	<	theTorsions[j].c = currentTorsion->getC() + atomOffset;
332	<	theTorsions[j].d = currentTorsion->getD() + atomOffset;
333	<
334	<	exI = theTorsions[j].a;
335	<	exJ = theTorsions[j].d;
336	<
337	<	// exclude_I must always be the smaller of the pair
338	<	if( exI > exJ ){
339	<	tempEx = exI;
340	<	exI = exJ;
341	<	exJ = tempEx;
361	<	}
325	>
326	>	for (j = 0; j < molInfo.nTorsions; j++){
327	>	currentTorsion = comp_stamps[stampID]->getTorsion(j);
328	>	theTorsions[j].a = currentTorsion->getA() + atomOffset;
329	>	theTorsions[j].b = currentTorsion->getB() + atomOffset;
330	>	theTorsions[j].c = currentTorsion->getC() + atomOffset;
331	>	theTorsions[j].d = currentTorsion->getD() + atomOffset;
332	>
333	>	exI = theTorsions[j].a;
334	>	exJ = theTorsions[j].d;
335	>
336	>	// exclude_I must always be the smaller of the pair
337	>	if (exI > exJ){
338	>	tempEx = exI;
339	>	exI = exJ;
340	>	exJ = tempEx;
341	>	}
342		#ifdef IS_MPI
343	<	tempEx = exI;
344	<	exI = info[k].atoms[tempEx]->getGlobalIndex() + 1;
345	<	tempEx = exJ;
346	<	exJ = info[k].atoms[tempEx]->getGlobalIndex() + 1;
347	<
348	<	info[k].excludes[j+excludeOffset]->setPair( exI, exJ );
343	>	tempEx = exI;
344	>	exI = info[k].atoms[tempEx]->getGlobalIndex() + 1;
345	>	tempEx = exJ;
346	>	exJ = info[k].atoms[tempEx]->getGlobalIndex() + 1;
347	>
348	>	info[k].excludes[j + excludeOffset]->setPair(exI, exJ);
349		#else  // isn't MPI
350	<	info[k].excludes[j+excludeOffset]->setPair( (exI+1), (exJ+1) );
350	>	info[k].excludes[j + excludeOffset]->setPair((exI + 1), (exJ + 1));
351		#endif  //is_mpi
352		}
353		excludeOffset += molInfo.nTorsions;
354	<
355	<
354	>
355	>
356		// send the arrays off to the forceField for init.
377	–
378	–	the_ff->initializeAtoms( molInfo.nAtoms, molInfo.myAtoms );
379	–	the_ff->initializeBonds( molInfo.nBonds, molInfo.myBonds, theBonds );
380	–	the_ff->initializeBends( molInfo.nBends, molInfo.myBends, theBends );
381	–	the_ff->initializeTorsions( molInfo.nTorsions, molInfo.myTorsions, theTorsions );
382	–
383	–
384	–	info[k].molecules[i].initialize( molInfo );
357
358	<
358	>	the_ff->initializeAtoms(molInfo.nAtoms, molInfo.myAtoms);
359	>	the_ff->initializeBonds(molInfo.nBonds, molInfo.myBonds, theBonds);
360	>	the_ff->initializeBends(molInfo.nBends, molInfo.myBends, theBends);
361	>	the_ff->initializeTorsions(molInfo.nTorsions, molInfo.myTorsions,
362	>	theTorsions);
363	>
364	>
365	>	info[k].molecules[i].initialize(molInfo);
366	>
367	>
368		atomOffset += molInfo.nAtoms;
369		delete[] theBonds;
370		delete[] theBends;
371		delete[] theTorsions;
372		}
373		}
374	<
374	>
375		#ifdef IS_MPI
376	<	sprintf( checkPointMsg, "all molecules initialized succesfully" );
376	>	sprintf(checkPointMsg, "all molecules initialized succesfully");
377		MPIcheckPoint();
378		#endif // is_mpi
379	<
379	>
380		// clean up the forcefield
381
382		the_ff->calcRcut();
383		the_ff->cleanMe();
403	–
384		}
385
386	<	void SimSetup::initFromBass( void ){
407	<
386	>	void SimSetup::initFromBass(void){
387		int i, j, k;
388		int n_cells;
389		double cellx, celly, cellz;
#	Line 418 | Line 397 | void SimSetup::initFromBass( void ){
397		vel[1] = 0.0;
398		vel[2] = 0.0;
399
400	<	temp1 = (double)tot_nmol / 4.0;
401	<	temp2 = pow( temp1, ( 1.0 / 3.0 ) );
402	<	temp3 = ceil( temp2 );
400	>	temp1 = (double) tot_nmol / 4.0;
401	>	temp2 = pow(temp1, (1.0 / 3.0));
402	>	temp3 = ceil(temp2);
403
404	<	have_extra =0;
405	<	if( temp2 < temp3 ){ // we have a non-complete lattice
406	<	have_extra =1;
404	>	have_extra = 0;
405	>	if (temp2 < temp3){
406	>	// we have a non-complete lattice
407	>	have_extra = 1;
408
409	<	n_cells = (int)temp3 - 1;
409	>	n_cells = (int) temp3 - 1;
410		cellx = info[0].boxL[0] / temp3;
411		celly = info[0].boxL[1] / temp3;
412		cellz = info[0].boxL[2] / temp3;
413	<	n_extra = tot_nmol - ( 4 * n_cells * n_cells * n_cells );
414	<	temp1 = ((double)n_extra) / ( pow( temp3, 3.0 ) - pow( n_cells, 3.0 ) );
415	<	n_per_extra = (int)ceil( temp1 );
413	>	n_extra = tot_nmol - (4 * n_cells * n_cells * n_cells);
414	>	temp1 = ((double) n_extra) / (pow(temp3, 3.0) - pow(n_cells, 3.0));
415	>	n_per_extra = (int) ceil(temp1);
416
417	<	if( n_per_extra > 4){
418	<	sprintf( painCave.errMsg,
419	<	"SimSetup error. There has been an error in constructing"
420	<	" the non-complete lattice.\n" );
417	>	if (n_per_extra > 4){
418	>	sprintf(painCave.errMsg,
419	>	"SimSetup error. There has been an error in constructing"
420	>	" the non-complete lattice.\n");
421		painCave.isFatal = 1;
422		simError();
423		}
424		}
425		else{
426	<	n_cells = (int)temp3;
426	>	n_cells = (int) temp3;
427		cellx = info[0].boxL[0] / temp3;
428		celly = info[0].boxL[1] / temp3;
429		cellz = info[0].boxL[2] / temp3;
#	Line 454 | Line 434 | void SimSetup::initFromBass( void ){
434		current_comp = 0;
435		current_atom_ndx = 0;
436
437	<	for( i=0; i < n_cells ; i++ ){
438	<	for( j=0; j < n_cells; j++ ){
439	<	for( k=0; k < n_cells; k++ ){
437	>	for (i = 0; i < n_cells ; i++){
438	>	for (j = 0; j < n_cells; j++){
439	>	for (k = 0; k < n_cells; k++){
440	>	makeElement(i * cellx, j * celly, k * cellz);
441
442	<	makeElement( i * cellx,
462	<	j * celly,
463	<	k * cellz );
442	>	makeElement(i * cellx + 0.5 * cellx, j * celly + 0.5 * celly, k * cellz);
443
444	<	makeElement( i * cellx + 0.5 * cellx,
466	<	j * celly + 0.5 * celly,
467	<	k * cellz );
444	>	makeElement(i * cellx, j * celly + 0.5 * celly, k * cellz + 0.5 * cellz);
445
446	<	makeElement( i * cellx,
470	<	j * celly + 0.5 * celly,
471	<	k * cellz + 0.5 * cellz );
472	<
473	<	makeElement( i * cellx + 0.5 * cellx,
474	<	j * celly,
475	<	k * cellz + 0.5 * cellz );
446	>	makeElement(i * cellx + 0.5 * cellx, j * celly, k * cellz + 0.5 * cellz);
447		}
448		}
449		}
450
451	<	if( have_extra ){
451	>	if (have_extra){
452		done = 0;
453
454		int start_ndx;
455	<	for( i=0; i < (n_cells+1) && !done; i++ ){
456	<	for( j=0; j < (n_cells+1) && !done; j++ ){
455	>	for (i = 0; i < (n_cells + 1) && !done; i++){
456	>	for (j = 0; j < (n_cells + 1) && !done; j++){
457	>	if (i < n_cells){
458	>	if (j < n_cells){
459	>	start_ndx = n_cells;
460	>	}
461	>	else
462	>	start_ndx = 0;
463	>	}
464	>	else
465	>	start_ndx = 0;
466
467	<	if( i < n_cells ){
467	>	for (k = start_ndx; k < (n_cells + 1) && !done; k++){
468	>	makeElement(i * cellx, j * celly, k * cellz);
469	>	done = (current_mol >= tot_nmol);
470
471	<	if( j < n_cells ){
472	<	start_ndx = n_cells;
473	<	}
474	<	else start_ndx = 0;
475	<	}
494	<	else start_ndx = 0;
471	>	if (!done && n_per_extra > 1){
472	>	makeElement(i * cellx + 0.5 * cellx, j * celly + 0.5 * celly,
473	>	k * cellz);
474	>	done = (current_mol >= tot_nmol);
475	>	}
476
477	<	for( k=start_ndx; k < (n_cells+1) && !done; k++ ){
477	>	if (!done && n_per_extra > 2){
478	>	makeElement(i * cellx, j * celly + 0.5 * celly,
479	>	k * cellz + 0.5 * cellz);
480	>	done = (current_mol >= tot_nmol);
481	>	}
482
483	<	makeElement( i * cellx,
484	<	j * celly,
485	<	k * cellz );
486	<	done = ( current_mol >= tot_nmol );
487	<
488	<	if( !done && n_per_extra > 1 ){
504	<	makeElement( i * cellx + 0.5 * cellx,
505	<	j * celly + 0.5 * celly,
506	<	k * cellz );
507	<	done = ( current_mol >= tot_nmol );
508	<	}
509	<
510	<	if( !done && n_per_extra > 2){
511	<	makeElement( i * cellx,
512	<	j * celly + 0.5 * celly,
513	<	k * cellz + 0.5 * cellz );
514	<	done = ( current_mol >= tot_nmol );
515	<	}
516	<
517	<	if( !done && n_per_extra > 3){
518	<	makeElement( i * cellx + 0.5 * cellx,
519	<	j * celly,
520	<	k * cellz + 0.5 * cellz );
521	<	done = ( current_mol >= tot_nmol );
522	<	}
523	<	}
483	>	if (!done && n_per_extra > 3){
484	>	makeElement(i * cellx + 0.5 * cellx, j * celly,
485	>	k * cellz + 0.5 * cellz);
486	>	done = (current_mol >= tot_nmol);
487	>	}
488	>	}
489		}
490		}
491		}
492
493	<	for( i=0; i<info[0].n_atoms; i++ ){
494	<	info[0].atoms[i]->setVel( vel );
493	>	for (i = 0; i < info[0].n_atoms; i++){
494	>	info[0].atoms[i]->setVel(vel);
495		}
496		}
497
498	<	void SimSetup::makeElement( double x, double y, double z ){
534	<
498	>	void SimSetup::makeElement(double x, double y, double z){
499		int k;
500		AtomStamp* current_atom;
501		DirectionalAtom* dAtom;
502		double rotMat[3][3];
503		double pos[3];
504
505	<	for( k=0; k<comp_stamps[current_comp]->getNAtoms(); k++ ){
506	<
507	<	current_atom = comp_stamps[current_comp]->getAtom( k );
508	<	if( !current_atom->havePosition() ){
509	<	sprintf( painCave.errMsg,
510	<	"SimSetup:initFromBass error.\n"
511	<	"\tComponent %s, atom %s does not have a position specified.\n"
512	<	"\tThe initialization routine is unable to give a start"
513	<	" position.\n",
550	<	comp_stamps[current_comp]->getID(),
551	<	current_atom->getType() );
505	>	for (k = 0; k < comp_stamps[current_comp]->getNAtoms(); k++){
506	>	current_atom = comp_stamps[current_comp]->getAtom(k);
507	>	if (!current_atom->havePosition()){
508	>	sprintf(painCave.errMsg,
509	>	"SimSetup:initFromBass error.\n"
510	>	"\tComponent %s, atom %s does not have a position specified.\n"
511	>	"\tThe initialization routine is unable to give a start"
512	>	" position.\n",
513	>	comp_stamps[current_comp]->getID(), current_atom->getType());
514		painCave.isFatal = 1;
515		simError();
516		}
517	<
517	>
518		pos[0] = x + current_atom->getPosX();
519		pos[1] = y + current_atom->getPosY();
520		pos[2] = z + current_atom->getPosZ();
559	–
560	–	info[0].atoms[current_atom_ndx]->setPos( pos );
521
522	<	if( info[0].atoms[current_atom_ndx]->isDirectional() ){
522	>	info[0].atoms[current_atom_ndx]->setPos(pos);
523
524	<	dAtom = (DirectionalAtom *)info[0].atoms[current_atom_ndx];
524	>	if (info[0].atoms[current_atom_ndx]->isDirectional()){
525	>	dAtom = (DirectionalAtom *) info[0].atoms[current_atom_ndx];
526
527		rotMat[0][0] = 1.0;
528		rotMat[0][1] = 0.0;
#	Line 575 | Line 536 | void SimSetup::makeElement( double x, double y, double
536		rotMat[2][1] = 0.0;
537		rotMat[2][2] = 1.0;
538
539	<	dAtom->setA( rotMat );
539	>	dAtom->setA(rotMat);
540		}
541
542		current_atom_ndx++;
#	Line 584 | Line 545 | void SimSetup::makeElement( double x, double y, double
545		current_mol++;
546		current_comp_mol++;
547
548	<	if( current_comp_mol >= components_nmol[current_comp] ){
588	<
548	>	if (current_comp_mol >= components_nmol[current_comp]){
549		current_comp_mol = 0;
550		current_comp++;
551		}
552		}
553
554
555	<	void SimSetup::gatherInfo( void ){
556	<	int i,j,k;
555	>	void SimSetup::gatherInfo(void){
556	>	int i;
557
558		ensembleCase = -1;
559		ffCase = -1;
560
561		// set the easy ones first
562
563	<	for( i=0; i<nInfo; i++){
563	>	for (i = 0; i < nInfo; i++){
564		info[i].target_temp = globals->getTargetTemp();
565		info[i].dt = globals->getDt();
566		info[i].run_time = globals->getRunTime();
#	Line 610 | Line 570 | void SimSetup::gatherInfo( void ){
570
571		// get the forceField
572
573	<	strcpy( force_field, globals->getForceField() );
573	>	strcpy(force_field, globals->getForceField());
574
575	<	if( !strcasecmp( force_field, "DUFF" )) ffCase = FF_DUFF;
576	<	else if( !strcasecmp( force_field, "LJ" )) ffCase = FF_LJ;
577	<	else if( !strcasecmp( force_field, "EAM" )) ffCase = FF_EAM;
575	>	if (!strcasecmp(force_field, "DUFF")){
576	>	ffCase = FF_DUFF;
577	>	}
578	>	else if (!strcasecmp(force_field, "LJ")){
579	>	ffCase = FF_LJ;
580	>	}
581	>	else if (!strcasecmp(force_field, "EAM")){
582	>	ffCase = FF_EAM;
583	>	}
584		else{
585	<	sprintf( painCave.errMsg,
586	<	"SimSetup Error. Unrecognized force field -> %s\n",
587	<	force_field );
588	<	painCave.isFatal = 1;
623	<	simError();
585	>	sprintf(painCave.errMsg, "SimSetup Error. Unrecognized force field -> %s\n",
586	>	force_field);
587	>	painCave.isFatal = 1;
588	>	simError();
589		}
590
591	<	// get the ensemble
591	>	// get the ensemble
592
593	<	strcpy( ensemble, globals->getEnsemble() );
593	>	strcpy(ensemble, globals->getEnsemble());
594
595	<	if( !strcasecmp( ensemble, "NVE" ))      ensembleCase = NVE_ENS;
596	<	else if( !strcasecmp( ensemble, "NVT" )) ensembleCase = NVT_ENS;
597	<	else if( !strcasecmp( ensemble, "NPTi" ) || !strcasecmp( ensemble, "NPT") )
595	>	if (!strcasecmp(ensemble, "NVE")){
596	>	ensembleCase = NVE_ENS;
597	>	}
598	>	else if (!strcasecmp(ensemble, "NVT")){
599	>	ensembleCase = NVT_ENS;
600	>	}
601	>	else if (!strcasecmp(ensemble, "NPTi") || !strcasecmp(ensemble, "NPT")){
602		ensembleCase = NPTi_ENS;
603	<	else if( !strcasecmp( ensemble, "NPTf" )) ensembleCase = NPTf_ENS;
604	<	else if( !strcasecmp( ensemble, "NPTim" )) ensembleCase = NPTim_ENS;
605	<	else if( !strcasecmp( ensemble, "NPTfm" )) ensembleCase = NPTfm_ENS;
603	>	}
604	>	else if (!strcasecmp(ensemble, "NPTf")){
605	>	ensembleCase = NPTf_ENS;
606	>	}
607		else{
608	<	sprintf( painCave.errMsg,
609	<	"SimSetup Warning. Unrecognized Ensemble -> %s, "
610	<	"reverting to NVE for this simulation.\n",
611	<	ensemble );
612	<	painCave.isFatal = 0;
613	<	simError();
614	<	strcpy( ensemble, "NVE" );
615	<	ensembleCase = NVE_ENS;
608	>	sprintf(painCave.errMsg,
609	>	"SimSetup Warning. Unrecognized Ensemble -> %s, "
610	>	"reverting to NVE for this simulation.\n",
611	>	ensemble);
612	>	painCave.isFatal = 0;
613	>	simError();
614	>	strcpy(ensemble, "NVE");
615	>	ensembleCase = NVE_ENS;
616		}
647	–
648	–	for(i=0; i<nInfo; i++){
649	–
650	–	strcpy( info[i].ensemble, ensemble );
617
618	+	for (i = 0; i < nInfo; i++){
619	+	strcpy(info[i].ensemble, ensemble);
620	+
621		// get the mixing rule
622
623	<	strcpy( info[i].mixingRule, globals->getMixingRule() );
623	>	strcpy(info[i].mixingRule, globals->getMixingRule());
624		info[i].usePBC = globals->getPBC();
625		}
626	<
626	>
627		// get the components and calculate the tot_nMol and indvidual n_mol
628	<
628	>
629		the_components = globals->getComponents();
630		components_nmol = new int[n_components];
631
632
633	<	if( !globals->haveNMol() ){
633	>	if (!globals->haveNMol()){
634		// we don't have the total number of molecules, so we assume it is
635		// given in each component
636
637		tot_nmol = 0;
638	<	for( i=0; i<n_components; i++ ){
639	<
640	<	if( !the_components[i]->haveNMol() ){
641	<	// we have a problem
642	<	sprintf( painCave.errMsg,
643	<	"SimSetup Error. No global NMol or component NMol"
644	<	" given. Cannot calculate the number of atoms.\n" );
645	<	painCave.isFatal = 1;
677	<	simError();
638	>	for (i = 0; i < n_components; i++){
639	>	if (!the_components[i]->haveNMol()){
640	>	// we have a problem
641	>	sprintf(painCave.errMsg,
642	>	"SimSetup Error. No global NMol or component NMol"
643	>	" given. Cannot calculate the number of atoms.\n");
644	>	painCave.isFatal = 1;
645	>	simError();
646		}
647
648		tot_nmol += the_components[i]->getNMol();
#	Line 682 | Line 650 | void SimSetup::gatherInfo( void ){
650		}
651		}
652		else{
653	<	sprintf( painCave.errMsg,
654	<	"SimSetup error.\n"
655	<	"\tSorry, the ability to specify total"
656	<	" nMols and then give molfractions in the components\n"
657	<	"\tis not currently supported."
658	<	" Please give nMol in the components.\n" );
653	>	sprintf(painCave.errMsg,
654	>	"SimSetup error.\n"
655	>	"\tSorry, the ability to specify total"
656	>	" nMols and then give molfractions in the components\n"
657	>	"\tis not currently supported."
658	>	" Please give nMol in the components.\n");
659		painCave.isFatal = 1;
660		simError();
661		}
662
663		// set the status, sample, and thermal kick times
696	–
697	–	for(i=0; i<nInfo; i++){
664
665	<	if( globals->haveSampleTime() ){
665	>	for (i = 0; i < nInfo; i++){
666	>	if (globals->haveSampleTime()){
667		info[i].sampleTime = globals->getSampleTime();
668		info[i].statusTime = info[i].sampleTime;
669		info[i].thermalTime = info[i].sampleTime;
#	Line 706 | Line 673 | void SimSetup::gatherInfo( void ){
673		info[i].statusTime = info[i].sampleTime;
674		info[i].thermalTime = info[i].sampleTime;
675		}
676	<
677	<	if( globals->haveStatusTime() ){
676	>
677	>	if (globals->haveStatusTime()){
678		info[i].statusTime = globals->getStatusTime();
679		}
680	<
681	<	if( globals->haveThermalTime() ){
680	>
681	>	if (globals->haveThermalTime()){
682		info[i].thermalTime = globals->getThermalTime();
683		}
684
685	+	info[i].resetIntegrator = 0;
686	+	if( globals->haveResetTime() ){
687	+	info[i].resetTime = globals->getResetTime();
688	+	info[i].resetIntegrator = 1;
689	+	}
690	+
691		// check for the temperature set flag
692
693	<	if( globals->haveTempSet() ) info[i].setTemp = globals->getTempSet();
694	<
693	>	if (globals->haveTempSet())
694	>	info[i].setTemp = globals->getTempSet();
695	>
696		// get some of the tricky things that may still be in the globals
697	<
697	>
698		double boxVector[3];
699	<	if( globals->haveBox() ){
699	>	if (globals->haveBox()){
700		boxVector[0] = globals->getBox();
701		boxVector[1] = globals->getBox();
702		boxVector[2] = globals->getBox();
703	<
704	<	info[i].setBox( boxVector );
703	>
704	>	info[i].setBox(boxVector);
705		}
706	<	else if( globals->haveDensity() ){
733	<
706	>	else if (globals->haveDensity()){
707		double vol;
708	<	vol = (double)tot_nmol / globals->getDensity();
709	<	boxVector[0] = pow( vol, ( 1.0 / 3.0 ) );
708	>	vol = (double) tot_nmol / globals->getDensity();
709	>	boxVector[0] = pow(vol, (1.0 / 3.0));
710		boxVector[1] = boxVector[0];
711		boxVector[2] = boxVector[0];
712	<
713	<	info[i].setBox( boxVector );
714	<	}
712	>
713	>	info[i].setBox(boxVector);
714	>	}
715		else{
716	<	if( !globals->haveBoxX() ){
717	<	sprintf( painCave.errMsg,
718	<	"SimSetup error, no periodic BoxX size given.\n" );
719	<	painCave.isFatal = 1;
720	<	simError();
716	>	if (!globals->haveBoxX()){
717	>	sprintf(painCave.errMsg,
718	>	"SimSetup error, no periodic BoxX size given.\n");
719	>	painCave.isFatal = 1;
720	>	simError();
721		}
722		boxVector[0] = globals->getBoxX();
723	<
724	<	if( !globals->haveBoxY() ){
725	<	sprintf( painCave.errMsg,
726	<	"SimSetup error, no periodic BoxY size given.\n" );
727	<	painCave.isFatal = 1;
728	<	simError();
723	>
724	>	if (!globals->haveBoxY()){
725	>	sprintf(painCave.errMsg,
726	>	"SimSetup error, no periodic BoxY size given.\n");
727	>	painCave.isFatal = 1;
728	>	simError();
729		}
730		boxVector[1] = globals->getBoxY();
731	<
732	<	if( !globals->haveBoxZ() ){
733	<	sprintf( painCave.errMsg,
734	<	"SimSetup error, no periodic BoxZ size given.\n" );
735	<	painCave.isFatal = 1;
736	<	simError();
731	>
732	>	if (!globals->haveBoxZ()){
733	>	sprintf(painCave.errMsg,
734	>	"SimSetup error, no periodic BoxZ size given.\n");
735	>	painCave.isFatal = 1;
736	>	simError();
737		}
738		boxVector[2] = globals->getBoxZ();
766	–
767	–	info[i].setBox( boxVector );
768	–	}
739
740	+	info[i].setBox(boxVector);
741	+	}
742		}
743	+
744	+	//setup seed for random number generator
745	+	int seedValue;
746	+
747	+	if (globals->haveSeed()){
748	+	seedValue = globals->getSeed();
749	+
750	+	if(seedValue / 1E9 == 0){
751	+	sprintf(painCave.errMsg,
752	+	"Seed for sprng library should contain at least 9 digits\n"
753	+	"OOPSE will generate a seed for user\n");
754	+	painCave.isFatal = 0;
755	+	simError();
756	+
757	+	//using seed generated by system instead of invalid seed set by user
758	+	#ifndef IS_MPI
759	+	seedValue = make_sprng_seed();
760	+	#else
761	+	if (worldRank == 0){
762	+	seedValue = make_sprng_seed();
763	+	}
764	+	MPI_Bcast(&seedValue, 1, MPI_INT, 0, MPI_COMM_WORLD);
765	+	#endif
766	+	}
767	+	}//end of if branch of globals->haveSeed()
768	+	else{
769
770	+	#ifndef IS_MPI
771	+	seedValue = make_sprng_seed();
772	+	#else
773	+	if (worldRank == 0){
774	+	seedValue = make_sprng_seed();
775	+	}
776	+	MPI_Bcast(&seedValue, 1, MPI_INT, 0, MPI_COMM_WORLD);
777	+	#endif
778	+	}//end of globals->haveSeed()
779	+
780	+	for (int i = 0; i < nInfo; i++){
781	+	info[i].setSeed(seedValue);
782	+	}
783	+
784		#ifdef IS_MPI
785	<	strcpy( checkPointMsg, "Succesfully gathered all information from Bass\n" );
785	>	strcpy(checkPointMsg, "Succesfully gathered all information from Bass\n");
786		MPIcheckPoint();
787		#endif // is_mpi
776	–
788		}
789
790
791	<	void SimSetup::finalInfoCheck( void ){
791	>	void SimSetup::finalInfoCheck(void){
792		int index;
793		int usesDipoles;
794		int i;
795
796	<	for(i=0; i<nInfo; i++){
796	>	for (i = 0; i < nInfo; i++){
797		// check electrostatic parameters
798	<
798	>
799		index = 0;
800		usesDipoles = 0;
801	<	while( (index < info[i].n_atoms) && !usesDipoles ){
801	>	while ((index < info[i].n_atoms) && !usesDipoles){
802		usesDipoles = (info[i].atoms[index])->hasDipole();
803		index++;
804		}
805	<
805	>
806		#ifdef IS_MPI
807		int myUse = usesDipoles;
808	<	MPI_Allreduce( &myUse, &usesDipoles, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD );
808	>	MPI_Allreduce(&myUse, &usesDipoles, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
809		#endif //is_mpi
810	<
810	>
811		double theEcr, theEst;
812	<
813	<	if (globals->getUseRF() ) {
812	>
813	>	if (globals->getUseRF()){
814		info[i].useReactionField = 1;
815	<
816	<	if( !globals->haveECR() ){
817	<	sprintf( painCave.errMsg,
818	<	"SimSetup Warning: using default value of 1/2 the smallest "
819	<	"box length for the electrostaticCutoffRadius.\n"
820	<	"I hope you have a very fast processor!\n");
821	<	painCave.isFatal = 0;
822	<	simError();
823	<	double smallest;
824	<	smallest = info[i].boxL[0];
825	<	if (info[i].boxL[1] <= smallest) smallest = info[i].boxL[1];
826	<	if (info[i].boxL[2] <= smallest) smallest = info[i].boxL[2];
827	<	theEcr = 0.5 * smallest;
828	<	} else {
829	<	theEcr = globals->getECR();
815	>
816	>	if (!globals->haveECR()){
817	>	sprintf(painCave.errMsg,
818	>	"SimSetup Warning: using default value of 1/2 the smallest "
819	>	"box length for the electrostaticCutoffRadius.\n"
820	>	"I hope you have a very fast processor!\n");
821	>	painCave.isFatal = 0;
822	>	simError();
823	>	double smallest;
824	>	smallest = info[i].boxL[0];
825	>	if (info[i].boxL[1] <= smallest)
826	>	smallest = info[i].boxL[1];
827	>	if (info[i].boxL[2] <= smallest)
828	>	smallest = info[i].boxL[2];
829	>	theEcr = 0.5 * smallest;
830		}
831	<
832	<	if( !globals->haveEST() ){
822	<	sprintf( painCave.errMsg,
823	<	"SimSetup Warning: using default value of 0.05 * the "
824	<	"electrostaticCutoffRadius for the electrostaticSkinThickness\n"
825	<	);
826	<	painCave.isFatal = 0;
827	<	simError();
828	<	theEst = 0.05 * theEcr;
829	<	} else {
830	<	theEst= globals->getEST();
831	>	else{
832	>	theEcr = globals->getECR();
833		}
834	<
835	<	info[i].setEcr( theEcr, theEst );
836	<
837	<	if(!globals->haveDielectric() ){
838	<	sprintf( painCave.errMsg,
839	<	"SimSetup Error: You are trying to use Reaction Field without"
840	<	"setting a dielectric constant!\n"
841	<	);
840	<	painCave.isFatal = 1;
841	<	simError();
834	>
835	>	if (!globals->haveEST()){
836	>	sprintf(painCave.errMsg,
837	>	"SimSetup Warning: using default value of 0.05 * the "
838	>	"electrostaticCutoffRadius for the electrostaticSkinThickness\n");
839	>	painCave.isFatal = 0;
840	>	simError();
841	>	theEst = 0.05 * theEcr;
842		}
843	<	info[i].dielectric = globals->getDielectric();
844	<	}
845	<	else {
846	<	if (usesDipoles) {
847	<
848	<	if( !globals->haveECR() ){
849	<	sprintf( painCave.errMsg,
850	<	"SimSetup Warning: using default value of 1/2 the smallest "
851	<	"box length for the electrostaticCutoffRadius.\n"
852	<	"I hope you have a very fast processor!\n");
853	<	painCave.isFatal = 0;
854	<	simError();
855	<	double smallest;
856	<	smallest = info[i].boxL[0];
857	<	if (info[i].boxL[1] <= smallest) smallest = info[i].boxL[1];
858	<	if (info[i].boxL[2] <= smallest) smallest = info[i].boxL[2];
859	<	theEcr = 0.5 * smallest;
860	<	} else {
861	<	theEcr = globals->getECR();
862	<	}
863	<
864	<	if( !globals->haveEST() ){
865	<	sprintf( painCave.errMsg,
866	<	"SimSetup Warning: using default value of 0.05 * the "
867	<	"electrostaticCutoffRadius for the "
868	<	"electrostaticSkinThickness\n"
869	<	);
870	<	painCave.isFatal = 0;
871	<	simError();
872	<	theEst = 0.05 * theEcr;
873	<	} else {
874	<	theEst= globals->getEST();
875	<	}
876	<
877	<	info[i].setEcr( theEcr, theEst );
843	>	else{
844	>	theEst = globals->getEST();
845		}
846	<	}
846	>
847	>	info[i].setEcr(theEcr, theEst);
848	>
849	>	if (!globals->haveDielectric()){
850	>	sprintf(painCave.errMsg,
851	>	"SimSetup Error: You are trying to use Reaction Field without"
852	>	"setting a dielectric constant!\n");
853	>	painCave.isFatal = 1;
854	>	simError();
855	>	}
856	>	info[i].dielectric = globals->getDielectric();
857	>	}
858	>	else{
859	>	if (usesDipoles){
860	>	if (!globals->haveECR()){
861	>	sprintf(painCave.errMsg,
862	>	"SimSetup Warning: using default value of 1/2 the smallest "
863	>	"box length for the electrostaticCutoffRadius.\n"
864	>	"I hope you have a very fast processor!\n");
865	>	painCave.isFatal = 0;
866	>	simError();
867	>	double smallest;
868	>	smallest = info[i].boxL[0];
869	>	if (info[i].boxL[1] <= smallest)
870	>	smallest = info[i].boxL[1];
871	>	if (info[i].boxL[2] <= smallest)
872	>	smallest = info[i].boxL[2];
873	>	theEcr = 0.5 * smallest;
874	>	}
875	>	else{
876	>	theEcr = globals->getECR();
877	>	}
878	>
879	>	if (!globals->haveEST()){
880	>	sprintf(painCave.errMsg,
881	>	"SimSetup Warning: using default value of 0.05 * the "
882	>	"electrostaticCutoffRadius for the "
883	>	"electrostaticSkinThickness\n");
884	>	painCave.isFatal = 0;
885	>	simError();
886	>	theEst = 0.05 * theEcr;
887	>	}
888	>	else{
889	>	theEst = globals->getEST();
890	>	}
891	>
892	>	info[i].setEcr(theEcr, theEst);
893	>	}
894	>	}
895		}
896
897		#ifdef IS_MPI
898	<	strcpy( checkPointMsg, "post processing checks out" );
898	>	strcpy(checkPointMsg, "post processing checks out");
899		MPIcheckPoint();
900		#endif // is_mpi
886	–
901		}
902
903	<	void SimSetup::initSystemCoords( void ){
903	>	void SimSetup::initSystemCoords(void){
904		int i;
905	<
905	>
906		char* inName;
907
908	+	(info[0].getConfiguration())->createArrays(info[0].n_atoms);
909
910	<	(info[0].getConfiguration())->createArrays( info[0].n_atoms );
911	<
912	<	for(i=0; i<info[0].n_atoms; i++) info[0].atoms[i]->setCoords();
913	<
899	<	if( globals->haveInitialConfig() ){
900	<
910	>	for (i = 0; i < info[0].n_atoms; i++)
911	>	info[0].atoms[i]->setCoords();
912	>
913	>	if (globals->haveInitialConfig()){
914		InitializeFromFile* fileInit;
915		#ifdef IS_MPI // is_mpi
916	<	if( worldRank == 0 ){
916	>	if (worldRank == 0){
917		#endif //is_mpi
918		inName = globals->getInitialConfig();
919	<	double* tempDouble = new double[1000000];
907	<	fileInit = new InitializeFromFile( inName );
919	>	fileInit = new InitializeFromFile(inName);
920		#ifdef IS_MPI
921	<	}else fileInit = new InitializeFromFile( NULL );
921	>	}
922	>	else
923	>	fileInit = new InitializeFromFile(NULL);
924		#endif
925	<	fileInit->readInit( info ); // default velocities on
926	<
925	>	fileInit->readInit(info); // default velocities on
926	>
927		delete fileInit;
928		}
929		else{
916	–
930		#ifdef IS_MPI
931	<
931	>
932		// no init from bass
933	<
934	<	sprintf( painCave.errMsg,
935	<	"Cannot intialize a parallel simulation without an initial configuration file.\n" );
936	<	painCave.isFatal;
933	>
934	>	sprintf(painCave.errMsg,
935	>	"Cannot intialize a parallel simulation without an initial configuration file.\n");
936	>	painCave.isFatal = 1;;
937		simError();
938	<
938	>
939		#else
940	<
940	>
941		initFromBass();
942	<
943	<
942	>
943	>
944		#endif
945		}
946	<
946	>
947		#ifdef IS_MPI
948	<	strcpy( checkPointMsg, "Successfully read in the initial configuration" );
948	>	strcpy(checkPointMsg, "Successfully read in the initial configuration");
949		MPIcheckPoint();
950		#endif // is_mpi
938	–
951		}
952
953
954	<	void SimSetup::makeOutNames( void ){
943	<
954	>	void SimSetup::makeOutNames(void){
955		int k;
956
946	–
947	–	for(k=0; k<nInfo; k++){
957
958	+	for (k = 0; k < nInfo; k++){
959		#ifdef IS_MPI
960	<	if( worldRank == 0 ){
960	>	if (worldRank == 0){
961		#endif // is_mpi
962	<
963	<	if( globals->haveFinalConfig() ){
964	<	strcpy( info[k].finalName, globals->getFinalConfig() );
962	>
963	>	if (globals->haveFinalConfig()){
964	>	strcpy(info[k].finalName, globals->getFinalConfig());
965		}
966		else{
967	<	strcpy( info[k].finalName, inFileName );
968	<	char* endTest;
969	<	int nameLength = strlen( info[k].finalName );
970	<	endTest = &(info[k].finalName[nameLength - 5]);
971	<	if( !strcmp( endTest, ".bass" ) ){
972	<	strcpy( endTest, ".eor" );
973	<	}
974	<	else if( !strcmp( endTest, ".BASS" ) ){
975	<	strcpy( endTest, ".eor" );
976	<	}
977	<	else{
978	<	endTest = &(info[k].finalName[nameLength - 4]);
979	<	if( !strcmp( endTest, ".bss" ) ){
980	<	strcpy( endTest, ".eor" );
981	<	}
982	<	else if( !strcmp( endTest, ".mdl" ) ){
983	<	strcpy( endTest, ".eor" );
984	<	}
985	<	else{
986	<	strcat( info[k].finalName, ".eor" );
987	<	}
988	<	}
967	>	strcpy(info[k].finalName, inFileName);
968	>	char* endTest;
969	>	int nameLength = strlen(info[k].finalName);
970	>	endTest = &(info[k].finalName[nameLength - 5]);
971	>	if (!strcmp(endTest, ".bass")){
972	>	strcpy(endTest, ".eor");
973	>	}
974	>	else if (!strcmp(endTest, ".BASS")){
975	>	strcpy(endTest, ".eor");
976	>	}
977	>	else{
978	>	endTest = &(info[k].finalName[nameLength - 4]);
979	>	if (!strcmp(endTest, ".bss")){
980	>	strcpy(endTest, ".eor");
981	>	}
982	>	else if (!strcmp(endTest, ".mdl")){
983	>	strcpy(endTest, ".eor");
984	>	}
985	>	else{
986	>	strcat(info[k].finalName, ".eor");
987	>	}
988	>	}
989		}
990	<
990	>
991		// make the sample and status out names
992	<
993	<	strcpy( info[k].sampleName, inFileName );
992	>
993	>	strcpy(info[k].sampleName, inFileName);
994		char* endTest;
995	<	int nameLength = strlen( info[k].sampleName );
995	>	int nameLength = strlen(info[k].sampleName);
996		endTest = &(info[k].sampleName[nameLength - 5]);
997	<	if( !strcmp( endTest, ".bass" ) ){
998	<	strcpy( endTest, ".dump" );
997	>	if (!strcmp(endTest, ".bass")){
998	>	strcpy(endTest, ".dump");
999		}
1000	<	else if( !strcmp( endTest, ".BASS" ) ){
1001	<	strcpy( endTest, ".dump" );
1000	>	else if (!strcmp(endTest, ".BASS")){
1001	>	strcpy(endTest, ".dump");
1002		}
1003		else{
1004	<	endTest = &(info[k].sampleName[nameLength - 4]);
1005	<	if( !strcmp( endTest, ".bss" ) ){
1006	<	strcpy( endTest, ".dump" );
1007	<	}
1008	<	else if( !strcmp( endTest, ".mdl" ) ){
1009	<	strcpy( endTest, ".dump" );
1010	<	}
1011	<	else{
1012	<	strcat( info[k].sampleName, ".dump" );
1013	<	}
1004	>	endTest = &(info[k].sampleName[nameLength - 4]);
1005	>	if (!strcmp(endTest, ".bss")){
1006	>	strcpy(endTest, ".dump");
1007	>	}
1008	>	else if (!strcmp(endTest, ".mdl")){
1009	>	strcpy(endTest, ".dump");
1010	>	}
1011	>	else{
1012	>	strcat(info[k].sampleName, ".dump");
1013	>	}
1014		}
1015	<
1016	<	strcpy( info[k].statusName, inFileName );
1017	<	nameLength = strlen( info[k].statusName );
1015	>
1016	>	strcpy(info[k].statusName, inFileName);
1017	>	nameLength = strlen(info[k].statusName);
1018		endTest = &(info[k].statusName[nameLength - 5]);
1019	<	if( !strcmp( endTest, ".bass" ) ){
1020	<	strcpy( endTest, ".stat" );
1019	>	if (!strcmp(endTest, ".bass")){
1020	>	strcpy(endTest, ".stat");
1021		}
1022	<	else if( !strcmp( endTest, ".BASS" ) ){
1023	<	strcpy( endTest, ".stat" );
1022	>	else if (!strcmp(endTest, ".BASS")){
1023	>	strcpy(endTest, ".stat");
1024		}
1025		else{
1026	<	endTest = &(info[k].statusName[nameLength - 4]);
1027	<	if( !strcmp( endTest, ".bss" ) ){
1028	<	strcpy( endTest, ".stat" );
1029	<	}
1030	<	else if( !strcmp( endTest, ".mdl" ) ){
1031	<	strcpy( endTest, ".stat" );
1032	<	}
1033	<	else{
1034	<	strcat( info[k].statusName, ".stat" );
1035	<	}
1026	>	endTest = &(info[k].statusName[nameLength - 4]);
1027	>	if (!strcmp(endTest, ".bss")){
1028	>	strcpy(endTest, ".stat");
1029	>	}
1030	>	else if (!strcmp(endTest, ".mdl")){
1031	>	strcpy(endTest, ".stat");
1032	>	}
1033	>	else{
1034	>	strcat(info[k].statusName, ".stat");
1035	>	}
1036		}
1037	<
1037	>
1038		#ifdef IS_MPI
1039	+
1040		}
1041		#endif // is_mpi
1042		}
1043		}
1044
1045
1046	<	void SimSetup::sysObjectsCreation( void ){
1047	<
1048	<	int i,k;
1038	<
1046	>	void SimSetup::sysObjectsCreation(void){
1047	>	int i, k;
1048	>
1049		// create the forceField
1050
1051		createFF();
#	Line 1050 | Line 1060 | void SimSetup::sysObjectsCreation( void ){
1060
1061		#ifdef IS_MPI
1062		// divide the molecules among the processors
1063	<
1063	>
1064		mpiMolDivide();
1065		#endif //is_mpi
1066	<
1066	>
1067		// create the atom and SRI arrays. Also initialize Molecule Stamp ID's
1068	<
1068	>
1069		makeSysArrays();
1070
1071		// make and initialize the molecules (all but atomic coordinates)
1072	<
1072	>
1073		makeMolecules();
1074	<
1075	<	for(k=0; k<nInfo; k++){
1074	>
1075	>	for (k = 0; k < nInfo; k++){
1076		info[k].identArray = new int[info[k].n_atoms];
1077	<	for(i=0; i<info[k].n_atoms; i++){
1077	>	for (i = 0; i < info[k].n_atoms; i++){
1078		info[k].identArray[i] = info[k].atoms[i]->getIdent();
1079		}
1080		}
1081		}
1082
1083
1084	<	void SimSetup::createFF( void ){
1084	>	void SimSetup::createFF(void){
1085	>	switch (ffCase){
1086	>	case FF_DUFF:
1087	>	the_ff = new DUFF();
1088	>	break;
1089
1090	<	switch( ffCase ){
1090	>	case FF_LJ:
1091	>	the_ff = new LJFF();
1092	>	break;
1093
1094	<	case FF_DUFF:
1095	<	the_ff = new DUFF();
1096	<	break;
1094	>	case FF_EAM:
1095	>	the_ff = new EAM_FF();
1096	>	break;
1097
1098	<	case FF_LJ:
1099	<	the_ff = new LJFF();
1100	<	break;
1101	<
1102	<	case FF_EAM:
1087	<	the_ff = new EAM_FF();
1088	<	break;
1089	<
1090	<	default:
1091	<	sprintf( painCave.errMsg,
1092	<	"SimSetup Error. Unrecognized force field in case statement.\n");
1093	<	painCave.isFatal = 1;
1094	<	simError();
1098	>	default:
1099	>	sprintf(painCave.errMsg,
1100	>	"SimSetup Error. Unrecognized force field in case statement.\n");
1101	>	painCave.isFatal = 1;
1102	>	simError();
1103		}
1104
1105		#ifdef IS_MPI
1106	<	strcpy( checkPointMsg, "ForceField creation successful" );
1106	>	strcpy(checkPointMsg, "ForceField creation successful");
1107		MPIcheckPoint();
1108		#endif // is_mpi
1101	–
1109		}
1110
1111
1112	<	void SimSetup::compList( void ){
1106	<
1112	>	void SimSetup::compList(void){
1113		int i;
1114		char* id;
1115		LinkedMolStamp* headStamp = new LinkedMolStamp();
1116		LinkedMolStamp* currentStamp = NULL;
1117	<	comp_stamps = new MoleculeStamp*[n_components];
1118	<
1117	>	comp_stamps = new MoleculeStamp * [n_components];
1118	>
1119		// make an array of molecule stamps that match the components used.
1120		// also extract the used stamps out into a separate linked list
1121	<
1122	<	for(i=0; i<nInfo; i++){
1121	>
1122	>	for (i = 0; i < nInfo; i++){
1123		info[i].nComponents = n_components;
1124		info[i].componentsNmol = components_nmol;
1125		info[i].compStamps = comp_stamps;
1126		info[i].headStamp = headStamp;
1127		}
1122	–
1128
1124	–	for( i=0; i<n_components; i++ ){
1129
1130	+	for (i = 0; i < n_components; i++){
1131		id = the_components[i]->getType();
1132		comp_stamps[i] = NULL;
1133	<
1133	>
1134		// check to make sure the component isn't already in the list
1135
1136	<	comp_stamps[i] = headStamp->match( id );
1137	<	if( comp_stamps[i] == NULL ){
1133	<
1136	>	comp_stamps[i] = headStamp->match(id);
1137	>	if (comp_stamps[i] == NULL){
1138		// extract the component from the list;
1139	<
1140	<	currentStamp = stamps->extractMolStamp( id );
1141	<	if( currentStamp == NULL ){
1142	<	sprintf( painCave.errMsg,
1143	<	"SimSetup error: Component \"%s\" was not found in the "
1144	<	"list of declared molecules\n",
1145	<	id );
1146	<	painCave.isFatal = 1;
1147	<	simError();
1139	>
1140	>	currentStamp = stamps->extractMolStamp(id);
1141	>	if (currentStamp == NULL){
1142	>	sprintf(painCave.errMsg,
1143	>	"SimSetup error: Component \"%s\" was not found in the "
1144	>	"list of declared molecules\n",
1145	>	id);
1146	>	painCave.isFatal = 1;
1147	>	simError();
1148		}
1149	<
1150	<	headStamp->add( currentStamp );
1151	<	comp_stamps[i] = headStamp->match( id );
1149	>
1150	>	headStamp->add(currentStamp);
1151	>	comp_stamps[i] = headStamp->match(id);
1152		}
1153		}
1154
1155		#ifdef IS_MPI
1156	<	strcpy( checkPointMsg, "Component stamps successfully extracted\n" );
1156	>	strcpy(checkPointMsg, "Component stamps successfully extracted\n");
1157		MPIcheckPoint();
1158		#endif // is_mpi
1159	+	}
1160
1161	+	void SimSetup::calcSysValues(void){
1162	+	int i;
1163
1164	<	}
1164	>	int* molMembershipArray;
1165
1159	–	void SimSetup::calcSysValues( void ){
1160	–	int i, j, k;
1161	–
1162	–	int *molMembershipArray;
1163	–
1166		tot_atoms = 0;
1167		tot_bonds = 0;
1168		tot_bends = 0;
1169		tot_torsions = 0;
1170	<	for( i=0; i<n_components; i++ ){
1171	<
1172	<	tot_atoms +=    components_nmol[i] * comp_stamps[i]->getNAtoms();
1173	<	tot_bonds +=    components_nmol[i] * comp_stamps[i]->getNBonds();
1172	<	tot_bends +=    components_nmol[i] * comp_stamps[i]->getNBends();
1170	>	for (i = 0; i < n_components; i++){
1171	>	tot_atoms += components_nmol[i] * comp_stamps[i]->getNAtoms();
1172	>	tot_bonds += components_nmol[i] * comp_stamps[i]->getNBonds();
1173	>	tot_bends += components_nmol[i] * comp_stamps[i]->getNBends();
1174		tot_torsions += components_nmol[i] * comp_stamps[i]->getNTorsions();
1175		}
1176	<
1176	>
1177		tot_SRI = tot_bonds + tot_bends + tot_torsions;
1178		molMembershipArray = new int[tot_atoms];
1179	<
1180	<	for(i=0; i<nInfo; i++){
1179	>
1180	>	for (i = 0; i < nInfo; i++){
1181		info[i].n_atoms = tot_atoms;
1182		info[i].n_bonds = tot_bonds;
1183		info[i].n_bends = tot_bends;
1184		info[i].n_torsions = tot_torsions;
1185		info[i].n_SRI = tot_SRI;
1186		info[i].n_mol = tot_nmol;
1187	<
1187	>
1188		info[i].molMembershipArray = molMembershipArray;
1189	<	}
1189	>	}
1190		}
1191
1192		#ifdef IS_MPI
1193
1194	<	void SimSetup::mpiMolDivide( void ){
1194	<
1194	>	void SimSetup::mpiMolDivide(void){
1195		int i, j, k;
1196		int localMol, allMol;
1197		int local_atoms, local_bonds, local_bends, local_torsions, local_SRI;
1198
1199	<	mpiSim = new mpiSimulation( info );
1200	<
1199	>	mpiSim = new mpiSimulation(info);
1200	>
1201		globalIndex = mpiSim->divideLabor();
1202
1203		// set up the local variables
1204	<
1204	>
1205		mol2proc = mpiSim->getMolToProcMap();
1206		molCompType = mpiSim->getMolComponentType();
1207	<
1207	>
1208		allMol = 0;
1209		localMol = 0;
1210		local_atoms = 0;
#	Line 1214 | Line 1214 | void SimSetup::mpiMolDivide( void ){
1214		globalAtomIndex = 0;
1215
1216
1217	<	for( i=0; i<n_components; i++ ){
1218	<
1219	<	for( j=0; j<components_nmol[i]; j++ ){
1220	<
1221	<	if( mol2proc[allMol] == worldRank ){
1222	<
1223	<	local_atoms +=    comp_stamps[i]->getNAtoms();
1224	<	local_bonds +=    comp_stamps[i]->getNBonds();
1225	<	local_bends +=    comp_stamps[i]->getNBends();
1226	<	local_torsions += comp_stamps[i]->getNTorsions();
1227	<	localMol++;
1217	>	for (i = 0; i < n_components; i++){
1218	>	for (j = 0; j < components_nmol[i]; j++){
1219	>	if (mol2proc[allMol] == worldRank){
1220	>	local_atoms += comp_stamps[i]->getNAtoms();
1221	>	local_bonds += comp_stamps[i]->getNBonds();
1222	>	local_bends += comp_stamps[i]->getNBends();
1223	>	local_torsions += comp_stamps[i]->getNTorsions();
1224	>	localMol++;
1225		}
1226	<	for (k = 0; k < comp_stamps[i]->getNAtoms(); k++) {
1226	>	for (k = 0; k < comp_stamps[i]->getNAtoms(); k++){
1227		info[0].molMembershipArray[globalAtomIndex] = allMol;
1228		globalAtomIndex++;
1229		}
1230
1231	<	allMol++;
1231	>	allMol++;
1232		}
1233		}
1234		local_SRI = local_bonds + local_bends + local_torsions;
1235	<
1235	>
1236		info[0].n_atoms = mpiSim->getMyNlocal();
1237	<
1238	<	if( local_atoms != info[0].n_atoms ){
1239	<	sprintf( painCave.errMsg,
1240	<	"SimSetup error: mpiSim's localAtom (%d) and SimSetup's"
1241	<	" localAtom (%d) are not equal.\n",
1242	<	info[0].n_atoms,
1246	<	local_atoms );
1237	>
1238	>	if (local_atoms != info[0].n_atoms){
1239	>	sprintf(painCave.errMsg,
1240	>	"SimSetup error: mpiSim's localAtom (%d) and SimSetup's"
1241	>	" localAtom (%d) are not equal.\n",
1242	>	info[0].n_atoms, local_atoms);
1243		painCave.isFatal = 1;
1244		simError();
1245		}
#	Line 1254 | Line 1250 | void SimSetup::mpiMolDivide( void ){
1250		info[0].n_SRI = local_SRI;
1251		info[0].n_mol = localMol;
1252
1253	<	strcpy( checkPointMsg, "Passed nlocal consistency check." );
1253	>	strcpy(checkPointMsg, "Passed nlocal consistency check.");
1254		MPIcheckPoint();
1255		}
1256	<
1256	>
1257		#endif // is_mpi
1258
1259
1260	<	void SimSetup::makeSysArrays( void ){
1261	<	int i, j, k, l;
1260	>	void SimSetup::makeSysArrays(void){
1261	>
1262	>	#ifndef IS_MPI
1263	>	int k, j;
1264	>	#endif // is_mpi
1265	>	int i, l;
1266
1267		Atom** the_atoms;
1268		Molecule* the_molecules;
1269		Exclude** the_excludes;
1270
1271	<
1272	<	for(l=0; l<nInfo; l++){
1273	<
1271	>
1272	>	for (l = 0; l < nInfo; l++){
1273		// create the atom and short range interaction arrays
1274	<
1275	<	the_atoms = new Atom*[info[l].n_atoms];
1274	>
1275	>	the_atoms = new Atom * [info[l].n_atoms];
1276		the_molecules = new Molecule[info[l].n_mol];
1277		int molIndex;
1278
1279		// initialize the molecule's stampID's
1280	<
1280	>
1281		#ifdef IS_MPI
1282	<
1283	<
1282	>
1283	>
1284		molIndex = 0;
1285	<	for(i=0; i<mpiSim->getTotNmol(); i++){
1286	<
1287	<	if(mol2proc[i] == worldRank ){
1288	<	the_molecules[molIndex].setStampID( molCompType[i] );
1289	<	the_molecules[molIndex].setMyIndex( molIndex );
1290	<	the_molecules[molIndex].setGlobalIndex( i );
1292	<	molIndex++;
1285	>	for (i = 0; i < mpiSim->getTotNmol(); i++){
1286	>	if (mol2proc[i] == worldRank){
1287	>	the_molecules[molIndex].setStampID(molCompType[i]);
1288	>	the_molecules[molIndex].setMyIndex(molIndex);
1289	>	the_molecules[molIndex].setGlobalIndex(i);
1290	>	molIndex++;
1291		}
1292		}
1293	<
1293	>
1294		#else // is_mpi
1295	<
1295	>
1296		molIndex = 0;
1297		globalAtomIndex = 0;
1298	<	for(i=0; i<n_components; i++){
1299	<	for(j=0; j<components_nmol[i]; j++ ){
1300	<	the_molecules[molIndex].setStampID( i );
1301	<	the_molecules[molIndex].setMyIndex( molIndex );
1302	<	the_molecules[molIndex].setGlobalIndex( molIndex );
1303	<	for (k = 0; k < comp_stamps[i]->getNAtoms(); k++) {
1304	<	info[l].molMembershipArray[globalAtomIndex] = molIndex;
1305	<	globalAtomIndex++;
1306	<	}
1307	<	molIndex++;
1298	>	for (i = 0; i < n_components; i++){
1299	>	for (j = 0; j < components_nmol[i]; j++){
1300	>	the_molecules[molIndex].setStampID(i);
1301	>	the_molecules[molIndex].setMyIndex(molIndex);
1302	>	the_molecules[molIndex].setGlobalIndex(molIndex);
1303	>	for (k = 0; k < comp_stamps[i]->getNAtoms(); k++){
1304	>	info[l].molMembershipArray[globalAtomIndex] = molIndex;
1305	>	globalAtomIndex++;
1306	>	}
1307	>	molIndex++;
1308		}
1309		}
1310	<
1311	<
1310	>
1311	>
1312		#endif // is_mpi
1313
1314
1315	<	if( info[l].n_SRI ){
1318	<
1315	>	if (info[l].n_SRI){
1316		Exclude::createArray(info[l].n_SRI);
1317	<	the_excludes = new Exclude*[info[l].n_SRI];
1318	<	for( int ex=0; ex<info[l].n_SRI; ex++){
1319	<	the_excludes[ex] = new Exclude(ex);
1317	>	the_excludes = new Exclude * [info[l].n_SRI];
1318	>	for (int ex = 0; ex < info[l].n_SRI; ex++){
1319	>	the_excludes[ex] = new Exclude(ex);
1320		}
1321		info[l].globalExcludes = new int;
1322		info[l].n_exclude = info[l].n_SRI;
1323		}
1324		else{
1325	<
1326	<	Exclude::createArray( 1 );
1330	<	the_excludes = new Exclude*;
1325	>	Exclude::createArray(1);
1326	>	the_excludes = new Exclude * ;
1327		the_excludes[0] = new Exclude(0);
1328	<	the_excludes[0]->setPair( 0,0 );
1328	>	the_excludes[0]->setPair(0, 0);
1329		info[l].globalExcludes = new int;
1330		info[l].globalExcludes[0] = 0;
1331		info[l].n_exclude = 0;
#	Line 1342 | Line 1338 | void SimSetup::makeSysArrays( void ){
1338		info[l].nGlobalExcludes = 0;
1339		info[l].excludes = the_excludes;
1340
1341	<	the_ff->setSimInfo( info );
1346	<
1341	>	the_ff->setSimInfo(info);
1342		}
1343		}
1344
1345	<	void SimSetup::makeIntegrator( void ){
1351	<
1345	>	void SimSetup::makeIntegrator(void){
1346		int k;
1347
1348	<	NVT<RealIntegrator>*  myNVT = NULL;
1349	<	NPTi<RealIntegrator>* myNPTi = NULL;
1350	<	NPTf<RealIntegrator>* myNPTf = NULL;
1351	<	NPTim<RealIntegrator>* myNPTim = NULL;
1352	<	NPTfm<RealIntegrator>* myNPTfm = NULL;
1353	<
1354	<	for(k=0; k<nInfo; k++){
1355	<
1356	<	switch( ensembleCase ){
1357	<
1358	<	case NVE_ENS:
1359	<	if (globals->haveZconstraints()){
1360	<	setupZConstraint(info[k]);
1361	<	new ZConstraint<NVE<RealIntegrator> >( &(info[k]), the_ff );
1348	>	NVE<RealIntegrator>* myNVE = NULL;
1349	>	NVT<RealIntegrator>* myNVT = NULL;
1350	>	NPTi<NPT<RealIntegrator> >* myNPTi = NULL;
1351	>	NPTf<NPT<RealIntegrator> >* myNPTf = NULL;
1352	>
1353	>	for (k = 0; k < nInfo; k++){
1354	>	switch (ensembleCase){
1355	>	case NVE_ENS:
1356	>	if (globals->haveZconstraints()){
1357	>	setupZConstraint(info[k]);
1358	>	myNVE = new ZConstraint<NVE<RealIntegrator> >(&(info[k]), the_ff);
1359	>	}
1360	>	else{
1361	>	myNVE = new NVE<RealIntegrator>(&(info[k]), the_ff);
1362		}
1363	+
1364	+	info->the_integrator = myNVE;
1365	+	break;
1366
1367	<	else
1368	<	new NVE<RealIntegrator>( &(info[k]), the_ff );
1369	<	break;
1370	<
1371	<	case NVT_ENS:
1372	<	if (globals->haveZconstraints()){
1373	<	setupZConstraint(info[k]);
1377	<	myNVT = new ZConstraint<NVT<RealIntegrator> >( &(info[k]), the_ff );
1378	<	}
1379	<	else
1380	<	myNVT = new NVT<RealIntegrator>( &(info[k]), the_ff );
1367	>	case NVT_ENS:
1368	>	if (globals->haveZconstraints()){
1369	>	setupZConstraint(info[k]);
1370	>	myNVT = new ZConstraint<NVT<RealIntegrator> >(&(info[k]), the_ff);
1371	>	}
1372	>	else
1373	>	myNVT = new NVT<RealIntegrator>(&(info[k]), the_ff);
1374
1375	<	myNVT->setTargetTemp(globals->getTargetTemp());
1383	<
1384	<	if (globals->haveTauThermostat())
1385	<	myNVT->setTauThermostat(globals->getTauThermostat());
1386	<
1387	<	else {
1388	<	sprintf( painCave.errMsg,
1389	<	"SimSetup error: If you use the NVT\n"
1390	<	"    ensemble, you must set tauThermostat.\n");
1391	<	painCave.isFatal = 1;
1392	<	simError();
1393	<	}
1394	<	break;
1395	<
1396	<	case NPTi_ENS:
1397	<	if (globals->haveZconstraints()){
1398	<	setupZConstraint(info[k]);
1399	<	myNPTi = new ZConstraint<NPTi<RealIntegrator> >( &(info[k]), the_ff );
1400	<	}
1401	<	else
1402	<	myNPTi = new NPTi<RealIntegrator>( &(info[k]), the_ff );
1375	>	myNVT->setTargetTemp(globals->getTargetTemp());
1376
1377	<	myNPTi->setTargetTemp( globals->getTargetTemp() );
1378	<
1379	<	if (globals->haveTargetPressure())
1380	<	myNPTi->setTargetPressure(globals->getTargetPressure());
1381	<	else {
1382	<	sprintf( painCave.errMsg,
1383	<	"SimSetup error: If you use a constant pressure\n"
1384	<	"    ensemble, you must set targetPressure in the BASS file.\n");
1385	<	painCave.isFatal = 1;
1413	<	simError();
1414	<	}
1415	<
1416	<	if( globals->haveTauThermostat() )
1417	<	myNPTi->setTauThermostat( globals->getTauThermostat() );
1418	<	else{
1419	<	sprintf( painCave.errMsg,
1420	<	"SimSetup error: If you use an NPT\n"
1421	<	"    ensemble, you must set tauThermostat.\n");
1422	<	painCave.isFatal = 1;
1423	<	simError();
1424	<	}
1425	<
1426	<	if( globals->haveTauBarostat() )
1427	<	myNPTi->setTauBarostat( globals->getTauBarostat() );
1428	<	else{
1429	<	sprintf( painCave.errMsg,
1430	<	"SimSetup error: If you use an NPT\n"
1431	<	"    ensemble, you must set tauBarostat.\n");
1432	<	painCave.isFatal = 1;
1433	<	simError();
1434	<	}
1435	<	break;
1436	<
1437	<	case NPTf_ENS:
1438	<	if (globals->haveZconstraints()){
1439	<	setupZConstraint(info[k]);
1440	<	myNPTf = new ZConstraint<NPTf<RealIntegrator> >( &(info[k]), the_ff );
1441	<	}
1442	<	else
1443	<	myNPTf = new NPTf<RealIntegrator>( &(info[k]), the_ff );
1377	>	if (globals->haveTauThermostat())
1378	>	myNVT->setTauThermostat(globals->getTauThermostat());
1379	>	else{
1380	>	sprintf(painCave.errMsg,
1381	>	"SimSetup error: If you use the NVT\n"
1382	>	"    ensemble, you must set tauThermostat.\n");
1383	>	painCave.isFatal = 1;
1384	>	simError();
1385	>	}
1386
1387	<	myNPTf->setTargetTemp( globals->getTargetTemp());
1388	<
1447	<	if (globals->haveTargetPressure())
1448	<	myNPTf->setTargetPressure(globals->getTargetPressure());
1449	<	else {
1450	<	sprintf( painCave.errMsg,
1451	<	"SimSetup error: If you use a constant pressure\n"
1452	<	"    ensemble, you must set targetPressure in the BASS file.\n");
1453	<	painCave.isFatal = 1;
1454	<	simError();
1455	<	}
1456	<
1457	<	if( globals->haveTauThermostat() )
1458	<	myNPTf->setTauThermostat( globals->getTauThermostat() );
1459	<	else{
1460	<	sprintf( painCave.errMsg,
1461	<	"SimSetup error: If you use an NPT\n"
1462	<	"    ensemble, you must set tauThermostat.\n");
1463	<	painCave.isFatal = 1;
1464	<	simError();
1465	<	}
1466	<
1467	<	if( globals->haveTauBarostat() )
1468	<	myNPTf->setTauBarostat( globals->getTauBarostat() );
1469	<	else{
1470	<	sprintf( painCave.errMsg,
1471	<	"SimSetup error: If you use an NPT\n"
1472	<	"    ensemble, you must set tauBarostat.\n");
1473	<	painCave.isFatal = 1;
1474	<	simError();
1475	<	}
1476	<	break;
1477	<
1478	<	case NPTim_ENS:
1479	<	if (globals->haveZconstraints()){
1480	<	setupZConstraint(info[k]);
1481	<	myNPTim = new ZConstraint<NPTim<RealIntegrator> >( &(info[k]), the_ff );
1482	<	}
1483	<	else
1484	<	myNPTim = new NPTim<RealIntegrator>( &(info[k]), the_ff );
1387	>	info->the_integrator = myNVT;
1388	>	break;
1389
1390	<	myNPTim->setTargetTemp( globals->getTargetTemp());
1391	<
1392	<	if (globals->haveTargetPressure())
1393	<	myNPTim->setTargetPressure(globals->getTargetPressure());
1394	<	else {
1395	<	sprintf( painCave.errMsg,
1396	<	"SimSetup error: If you use a constant pressure\n"
1493	<	"    ensemble, you must set targetPressure in the BASS file.\n");
1494	<	painCave.isFatal = 1;
1495	<	simError();
1496	<	}
1497	<
1498	<	if( globals->haveTauThermostat() )
1499	<	myNPTim->setTauThermostat( globals->getTauThermostat() );
1500	<	else{
1501	<	sprintf( painCave.errMsg,
1502	<	"SimSetup error: If you use an NPT\n"
1503	<	"    ensemble, you must set tauThermostat.\n");
1504	<	painCave.isFatal = 1;
1505	<	simError();
1506	<	}
1507	<
1508	<	if( globals->haveTauBarostat() )
1509	<	myNPTim->setTauBarostat( globals->getTauBarostat() );
1510	<	else{
1511	<	sprintf( painCave.errMsg,
1512	<	"SimSetup error: If you use an NPT\n"
1513	<	"    ensemble, you must set tauBarostat.\n");
1514	<	painCave.isFatal = 1;
1515	<	simError();
1516	<	}
1517	<	break;
1518	<
1519	<	case NPTfm_ENS:
1520	<	if (globals->haveZconstraints()){
1521	<	setupZConstraint(info[k]);
1522	<	myNPTfm = new ZConstraint<NPTfm<RealIntegrator> >( &(info[k]), the_ff );
1523	<	}
1524	<	else
1525	<	myNPTfm = new NPTfm<RealIntegrator>( &(info[k]), the_ff );
1390	>	case NPTi_ENS:
1391	>	if (globals->haveZconstraints()){
1392	>	setupZConstraint(info[k]);
1393	>	myNPTi = new ZConstraint<NPTi<NPT <RealIntegrator> > >(&(info[k]), the_ff);
1394	>	}
1395	>	else
1396	>	myNPTi = new NPTi<NPT<RealIntegrator> >(&(info[k]), the_ff);
1397
1398	<	myNPTfm->setTargetTemp( globals->getTargetTemp());
1399	<
1400	<	if (globals->haveTargetPressure())
1401	<	myNPTfm->setTargetPressure(globals->getTargetPressure());
1402	<	else {
1403	<	sprintf( painCave.errMsg,
1404	<	"SimSetup error: If you use a constant pressure\n"
1405	<	"    ensemble, you must set targetPressure in the BASS file.\n");
1406	<	painCave.isFatal = 1;
1407	<	simError();
1408	<	}
1409	<
1410	<	if( globals->haveTauThermostat() )
1411	<	myNPTfm->setTauThermostat( globals->getTauThermostat() );
1412	<	else{
1413	<	sprintf( painCave.errMsg,
1414	<	"SimSetup error: If you use an NPT\n"
1415	<	"    ensemble, you must set tauThermostat.\n");
1416	<	painCave.isFatal = 1;
1417	<	simError();
1418	<	}
1419	<
1420	<	if( globals->haveTauBarostat() )
1421	<	myNPTfm->setTauBarostat( globals->getTauBarostat() );
1422	<	else{
1423	<	sprintf( painCave.errMsg,
1424	<	"SimSetup error: If you use an NPT\n"
1425	<	"    ensemble, you must set tauBarostat.\n");
1426	<	painCave.isFatal = 1;
1427	<	simError();
1428	<	}
1429	<	break;
1430	<
1431	<	default:
1432	<	sprintf( painCave.errMsg,
1433	<	"SimSetup Error. Unrecognized ensemble in case statement.\n");
1434	<	painCave.isFatal = 1;
1435	<	simError();
1398	>	myNPTi->setTargetTemp(globals->getTargetTemp());
1399	>
1400	>	if (globals->haveTargetPressure())
1401	>	myNPTi->setTargetPressure(globals->getTargetPressure());
1402	>	else{
1403	>	sprintf(painCave.errMsg,
1404	>	"SimSetup error: If you use a constant pressure\n"
1405	>	"    ensemble, you must set targetPressure in the BASS file.\n");
1406	>	painCave.isFatal = 1;
1407	>	simError();
1408	>	}
1409	>
1410	>	if (globals->haveTauThermostat())
1411	>	myNPTi->setTauThermostat(globals->getTauThermostat());
1412	>	else{
1413	>	sprintf(painCave.errMsg,
1414	>	"SimSetup error: If you use an NPT\n"
1415	>	"    ensemble, you must set tauThermostat.\n");
1416	>	painCave.isFatal = 1;
1417	>	simError();
1418	>	}
1419	>
1420	>	if (globals->haveTauBarostat())
1421	>	myNPTi->setTauBarostat(globals->getTauBarostat());
1422	>	else{
1423	>	sprintf(painCave.errMsg,
1424	>	"SimSetup error: If you use an NPT\n"
1425	>	"    ensemble, you must set tauBarostat.\n");
1426	>	painCave.isFatal = 1;
1427	>	simError();
1428	>	}
1429	>
1430	>	info->the_integrator = myNPTi;
1431	>	break;
1432	>
1433	>	case NPTf_ENS:
1434	>	if (globals->haveZconstraints()){
1435	>	setupZConstraint(info[k]);
1436	>	myNPTf = new ZConstraint<NPTf<NPT <RealIntegrator> > >(&(info[k]), the_ff);
1437	>	}
1438	>	else
1439	>	myNPTf = new NPTf<NPT <RealIntegrator> >(&(info[k]), the_ff);
1440	>
1441	>	myNPTf->setTargetTemp(globals->getTargetTemp());
1442	>
1443	>	if (globals->haveTargetPressure())
1444	>	myNPTf->setTargetPressure(globals->getTargetPressure());
1445	>	else{
1446	>	sprintf(painCave.errMsg,
1447	>	"SimSetup error: If you use a constant pressure\n"
1448	>	"    ensemble, you must set targetPressure in the BASS file.\n");
1449	>	painCave.isFatal = 1;
1450	>	simError();
1451	>	}
1452	>
1453	>	if (globals->haveTauThermostat())
1454	>	myNPTf->setTauThermostat(globals->getTauThermostat());
1455	>	else{
1456	>	sprintf(painCave.errMsg,
1457	>	"SimSetup error: If you use an NPT\n"
1458	>	"    ensemble, you must set tauThermostat.\n");
1459	>	painCave.isFatal = 1;
1460	>	simError();
1461	>	}
1462	>
1463	>	if (globals->haveTauBarostat())
1464	>	myNPTf->setTauBarostat(globals->getTauBarostat());
1465	>	else{
1466	>	sprintf(painCave.errMsg,
1467	>	"SimSetup error: If you use an NPT\n"
1468	>	"    ensemble, you must set tauBarostat.\n");
1469	>	painCave.isFatal = 1;
1470	>	simError();
1471	>	}
1472	>
1473	>	info->the_integrator = myNPTf;
1474	>	break;
1475	>
1476	>	default:
1477	>	sprintf(painCave.errMsg,
1478	>	"SimSetup Error. Unrecognized ensemble in case statement.\n");
1479	>	painCave.isFatal = 1;
1480	>	simError();
1481		}
1482		}
1483		}
1484
1485	<	void SimSetup::initFortran( void ){
1570	<
1485	>	void SimSetup::initFortran(void){
1486		info[0].refreshSim();
1487	<
1488	<	if( !strcmp( info[0].mixingRule, "standard") ){
1489	<	the_ff->initForceField( LB_MIXING_RULE );
1487	>
1488	>	if (!strcmp(info[0].mixingRule, "standard")){
1489	>	the_ff->initForceField(LB_MIXING_RULE);
1490		}
1491	<	else if( !strcmp( info[0].mixingRule, "explicit") ){
1492	<	the_ff->initForceField( EXPLICIT_MIXING_RULE );
1491	>	else if (!strcmp(info[0].mixingRule, "explicit")){
1492	>	the_ff->initForceField(EXPLICIT_MIXING_RULE);
1493		}
1494		else{
1495	<	sprintf( painCave.errMsg,
1496	<	"SimSetup Error: unknown mixing rule -> \"%s\"\n",
1582	<	info[0].mixingRule );
1495	>	sprintf(painCave.errMsg, "SimSetup Error: unknown mixing rule -> \"%s\"\n",
1496	>	info[0].mixingRule);
1497		painCave.isFatal = 1;
1498		simError();
1499		}
1500
1501
1502		#ifdef IS_MPI
1503	<	strcpy( checkPointMsg,
1590	<	"Successfully intialized the mixingRule for Fortran." );
1503	>	strcpy(checkPointMsg, "Successfully intialized the mixingRule for Fortran.");
1504		MPIcheckPoint();
1505		#endif // is_mpi
1593	–
1506		}
1507
1508	<	void SimSetup::setupZConstraint(SimInfo& theInfo)
1509	<	{
1510	<	int nZConstraints;
1599	<	ZconStamp** zconStamp;
1600	<
1601	<	if(globals->haveZconstraintTime()){
1602	<
1603	<	//add sample time of z-constraint  into SimInfo's property list
1604	<	DoubleData* zconsTimeProp = new DoubleData();
1605	<	zconsTimeProp->setID(ZCONSTIME_ID);
1606	<	zconsTimeProp->setData(globals->getZconsTime());
1607	<	theInfo.addProperty(zconsTimeProp);
1608	<	}
1609	<	else{
1610	<	sprintf( painCave.errMsg,
1611	<	"ZConstraint error: If you use an ZConstraint\n"
1612	<	" , you must set sample time.\n");
1613	<	painCave.isFatal = 1;
1614	<	simError();
1615	<	}
1508	>	void SimSetup::setupZConstraint(SimInfo& theInfo){
1509	>	int nZConstraints;
1510	>	ZconStamp** zconStamp;
1511
1512	<	//
1513	<	nZConstraints = globals->getNzConstraints();
1514	<	theInfo.nZconstraints = nZConstraints;
1515	<
1516	<	zconStamp = globals->getZconStamp();
1517	<	ZConsParaItem tempParaItem;
1512	>	if (globals->haveZconstraintTime()){
1513	>	//add sample time of z-constraint  into SimInfo's property list
1514	>	DoubleData* zconsTimeProp = new DoubleData();
1515	>	zconsTimeProp->setID(ZCONSTIME_ID);
1516	>	zconsTimeProp->setData(globals->getZconsTime());
1517	>	theInfo.addProperty(zconsTimeProp);
1518	>	}
1519	>	else{
1520	>	sprintf(painCave.errMsg,
1521	>	"ZConstraint error: If you use an ZConstraint\n"
1522	>	" , you must set sample time.\n");
1523	>	painCave.isFatal = 1;
1524	>	simError();
1525	>	}
1526
1527	<	ZConsParaData* zconsParaData = new ZConsParaData();
1528	<	zconsParaData->setID(ZCONSPARADATA_ID);
1529	<
1530	<	for(int i = 0; i < nZConstraints; i++){
1527	>	//push zconsTol into siminfo, if user does not specify
1528	>	//value for zconsTol, a default value will be used
1529	>	DoubleData* zconsTol = new DoubleData();
1530	>	zconsTol->setID(ZCONSTOL_ID);
1531	>	if (globals->haveZconsTol()){
1532	>	zconsTol->setData(globals->getZconsTol());
1533	>	}
1534	>	else{
1535	>	double defaultZConsTol = 0.01;
1536	>	sprintf(painCave.errMsg,
1537	>	"ZConstraint Waring: Tolerance for z-constraint methodl is not specified\n"
1538	>	" , default value %f is used.\n",
1539	>	defaultZConsTol);
1540	>	painCave.isFatal = 0;
1541	>	simError();
1542	>
1543	>	zconsTol->setData(defaultZConsTol);
1544	>	}
1545	>	theInfo.addProperty(zconsTol);
1546	>
1547	>	//set Force Subtraction Policy
1548	>	StringData* zconsForcePolicy = new StringData();
1549	>	zconsForcePolicy->setID(ZCONSFORCEPOLICY_ID);
1550	>
1551	>	if (globals->haveZconsForcePolicy()){
1552	>	zconsForcePolicy->setData(globals->getZconsForcePolicy());
1553	>	}
1554	>	else{
1555	>	sprintf(painCave.errMsg,
1556	>	"ZConstraint Warning: User does not set force Subtraction policy, "
1557	>	"PolicyByMass is used\n");
1558	>	painCave.isFatal = 0;
1559	>	simError();
1560	>	zconsForcePolicy->setData("BYMASS");
1561	>	}
1562	>
1563	>	theInfo.addProperty(zconsForcePolicy);
1564	>
1565	>	//Determine the name of ouput file and add it into SimInfo's property list
1566	>	//Be careful, do not use inFileName, since it is a pointer which
1567	>	//point to a string at master node, and slave nodes do not contain that string
1568	>
1569	>	string zconsOutput(theInfo.finalName);
1570	>
1571	>	zconsOutput = zconsOutput.substr(0, zconsOutput.rfind(".")) + ".fz";
1572	>
1573	>	StringData* zconsFilename = new StringData();
1574	>	zconsFilename->setID(ZCONSFILENAME_ID);
1575	>	zconsFilename->setData(zconsOutput);
1576	>
1577	>	theInfo.addProperty(zconsFilename);
1578	>
1579	>	//setup index, pos and other parameters of z-constraint molecules
1580	>	nZConstraints = globals->getNzConstraints();
1581	>	theInfo.nZconstraints = nZConstraints;
1582	>
1583	>	zconStamp = globals->getZconStamp();
1584	>	ZConsParaItem tempParaItem;
1585	>
1586	>	ZConsParaData* zconsParaData = new ZConsParaData();
1587	>	zconsParaData->setID(ZCONSPARADATA_ID);
1588	>
1589	>	for (int i = 0; i < nZConstraints; i++){
1590		tempParaItem.havingZPos = zconStamp[i]->haveZpos();
1591		tempParaItem.zPos = zconStamp[i]->getZpos();
1592		tempParaItem.zconsIndex = zconStamp[i]->getMolIndex();
1593		tempParaItem.kRatio = zconStamp[i]->getKratio();
1594
1595		zconsParaData->addItem(tempParaItem);
1596	<	}
1596	>	}
1597
1598	<	//sort the parameters by index of molecules
1599	<	zconsParaData->sortByIndex();
1600	<
1601	<	//push data into siminfo, therefore, we can retrieve later
1602	<	theInfo.addProperty(zconsParaData);
1598	>	//check the uniqueness of index
1599	>	if(!zconsParaData->isIndexUnique()){
1600	>	sprintf(painCave.errMsg,
1601	>	"ZConstraint Error: molIndex is not unique\n");
1602	>	painCave.isFatal = 1;
1603	>	simError();
1604	>	}
1605
1606	<	//push zconsTol into siminfo, if user does not specify
1607	<	//value for zconsTol, a default value will be used
1608	<	DoubleData* zconsTol = new DoubleData();
1609	<	zconsTol->setID(ZCONSTOL_ID);
1610	<	if(globals->haveZconsTol()){
1647	<	zconsTol->setData(globals->getZconsTol());
1648	<	}
1649	<	else{
1650	<	double defaultZConsTol = 1E-6;
1651	<	sprintf( painCave.errMsg,
1652	<	"ZConstraint Waring: Tolerance for z-constraint methodl is not specified\n"
1653	<	" , default value %f is used.\n", defaultZConsTol);
1654	<	painCave.isFatal = 0;
1655	<	simError();
1656	<
1657	<	zconsTol->setData(defaultZConsTol);
1658	<	}
1659	<	theInfo.addProperty(zconsTol);
1660	<
1661	<	//Determine the name of ouput file and add it into SimInfo's property list
1662	<	//Be careful, do not use inFileName, since it is a pointer which
1663	<	//point to a string at master node, and slave nodes do not contain that string
1664	<
1665	<	string zconsOutput(theInfo.finalName);
1666	<
1667	<	zconsOutput = zconsOutput.substr(0, zconsOutput.rfind(".")) + ".fz";
1668	<
1669	<	StringData* zconsFilename = new StringData();
1670	<	zconsFilename->setID(ZCONSFILENAME_ID);
1671	<	zconsFilename->setData(zconsOutput);
1672	<
1673	<	theInfo.addProperty(zconsFilename);
1606	>	//sort the parameters by index of molecules
1607	>	zconsParaData->sortByIndex();
1608	>
1609	>	//push data into siminfo, therefore, we can retrieve later
1610	>	theInfo.addProperty(zconsParaData);
1611		}

Diff Legend

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