ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/utils/bilayerSys.cpp
(Generate patch)

Comparing trunk/OOPSE/utils/bilayerSys.cpp (file contents):
Revision 502 by mmeineke, Tue Apr 15 21:47:54 2003 UTC vs.
Revision 506 by mmeineke, Fri Apr 25 16:02:26 2003 UTC

# Line 1 | Line 1
1 + #include <iostream>
2 +
3   #include <cstdlib>
4   #include <cstring>
5   #include <cmath>
# Line 37 | Line 39 | int buildRandomBilayer( void ){
39    int nAtoms, atomIndex, molIndex, molID;
40    int* molSeq;
41    int* molMap;
42 +  int* molStart;
43    int* cardDeck;
44    int deckSize;
45    int rSite, rCard;
# Line 54 | Line 57 | int buildRandomBilayer( void ){
57    
58    srand48( RAND_SEED );
59    molSeq = NULL;
60 +  molStart = NULL;
61    molMap = NULL;
62    cardDeck = NULL;
63    atoms = NULL;
# Line 102 | Line 106 | int buildRandomBilayer( void ){
106    molIndex = 0;
107    locate = new MoLocator*[bsInfo.nComponents];
108    molSeq = new int[bsInfo.totNmol];
109 +  molStart = new int[bsInfo.totNmol];  
110    for(i=0; i<bsInfo.nComponents; i++){
111      locate[i] = new MoLocator( bsInfo.compStamps[i] );
112      for(j=0; j<bsInfo.componentsNmol[i]; j++){
113        molSeq[molIndex] = i;
114 +      molStart[molIndex] = nAtoms;
115        molIndex++;
116        nAtoms += bsInfo.compStamps[i]->getNAtoms();
117      }
# Line 121 | Line 127 | int buildRandomBilayer( void ){
127    for(i=0; i<bsInfo.nComponents; i++){
128      if(cell < locate[i]->getMaxLength() ) cell = locate[i]->getMaxLength();
129    }
130 +  cell *= 1.2; // add a little buffer
131 +
132    cell *= M_SQRT2;
133  
134    siteIndex = 0;
127 –  atomIndex = 0;
135    for(i=0; i<nCells; i++){
136      for(j=0; j<nCells; j++){
137        for(k=0; k<nCells; k++){
# Line 136 | Line 143 | int buildRandomBilayer( void ){
143            
144            getRandomRot( rot );
145            molID = molSeq[molMap[siteIndex]];
146 <          locate[molID]->placeMol( pos, rot, &atoms[atomIndex] );
147 <          
141 <          atomIndex += bsInfo.compStamps[molID]->getNAtoms();
146 >          atomIndex = molStart[ molMap[siteIndex] ];
147 >          locate[molID]->placeMol( pos, rot, atoms, atomIndex );
148          }
149          siteIndex++;
150  
# Line 146 | Line 152 | int buildRandomBilayer( void ){
152            pos[0] = i * cell + (0.5 * cell);
153            pos[1] = j * cell;
154            pos[2] = k * cell + (0.5 * cell);
155 <          
155 >
156            getRandomRot( rot );
157            molID = molSeq[molMap[siteIndex]];
158 <          locate[molID]->placeMol( pos, rot, &atoms[atomIndex] );
159 <          
154 <          atomIndex += bsInfo.compStamps[molID]->getNAtoms();
158 >          atomIndex = molStart[ molMap[siteIndex] ];
159 >          locate[molID]->placeMol( pos, rot, atoms, atomIndex );
160          }
161          siteIndex++;
162  
# Line 162 | Line 167 | int buildRandomBilayer( void ){
167            
168            getRandomRot( rot );
169            molID = molSeq[molMap[siteIndex]];
170 <          locate[molID]->placeMol( pos, rot, &atoms[atomIndex] );
171 <          
167 <          atomIndex += bsInfo.compStamps[molID]->getNAtoms();
170 >          atomIndex = molStart[ molMap[siteIndex] ];
171 >          locate[molID]->placeMol( pos, rot, atoms, atomIndex );
172          }
173          siteIndex++;
174  
# Line 172 | Line 176 | int buildRandomBilayer( void ){
176            pos[0] = i * cell;
177            pos[1] = j * cell + (0.5 * cell);
178            pos[2] = k * cell + (0.5 * cell);
179 <          
179 >
180            getRandomRot( rot );
181            molID = molSeq[molMap[siteIndex]];
182 <          locate[molID]->placeMol( pos, rot, &atoms[atomIndex] );
183 <          
180 <          atomIndex += bsInfo.compStamps[molID]->getNAtoms();
182 >          atomIndex = molStart[ molMap[siteIndex] ];
183 >          locate[molID]->placeMol( pos, rot, atoms, atomIndex );
184          }
185          siteIndex++;
186        }
# Line 196 | Line 199 | int buildRandomBilayer( void ){
199    simnfo->box_y = bsInfo.boxY;
200    simnfo->box_z = bsInfo.boxZ;
201    
202 <  sprintf( simnfo->statusName, "%s.dump", bsInfo.outPrefix );
202 >  sprintf( simnfo->sampleName, "%s.dump", bsInfo.outPrefix );
203    sprintf( simnfo->finalName, "%s.init", bsInfo.outPrefix );
204 <  
204 >
205    simnfo->atoms = atoms;
206    
207    // set up the writer and write out

Diff Legend

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