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 614 by mmeineke, Tue Jul 15 17:57:04 2003 UTC vs.
Revision 859 by mmeineke, Mon Nov 10 21:50:36 2003 UTC

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

Diff Legend

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