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

Comparing trunk/OOPSE/libmdtools/SimInfo.cpp (file contents):
Revision 574 by gezelter, Tue Jul 8 20:56:10 2003 UTC vs.
Revision 669 by chuckv, Thu Aug 7 00:47:33 2003 UTC

# Line 33 | Line 33 | SimInfo::SimInfo(){
33    the_integrator = NULL;
34    setTemp = 0;
35    thermalTime = 0.0;
36 +  currentTime = 0.0;
37    rCut = 0.0;
38 +  ecr = 0.0;
39 +  est = 0.0;
40 +  oldEcr = 0.0;
41 +  oldRcut = 0.0;
42  
43 +  haveOrigRcut = 0;
44 +  haveOrigEcr = 0;
45 +  boxIsInit = 0;
46 +  
47 +  
48 +
49    usePBC = 0;
50    useLJ = 0;
51    useSticky = 0;
# Line 46 | Line 57 | SimInfo::SimInfo(){
57    wrapMeSimInfo( this );
58   }
59  
60 < void SimInfo::setBox(double newBox[3]) {
60 > SimInfo::~SimInfo(){
61  
62 <  double smallestBoxL, maxCutoff;
63 <  int status;
64 <  int i;
62 >  map<string, GenericData*>::iterator i;
63 >  
64 >  for(i = properties.begin(); i != properties.end(); i++)
65 >    delete (*i).second;
66  
67 <  for(i=0; i<9; i++) Hmat[i] = 0.0;;
67 >  
68 > }
69  
70 <  Hmat[0] = newBox[0];
71 <  Hmat[4] = newBox[1];
72 <  Hmat[8] = newBox[2];
70 > void SimInfo::setBox(double newBox[3]) {
71 >  
72 >  int i, j;
73 >  double tempMat[3][3];
74  
75 <  calcHmatI();
76 <  calcBoxL();
75 >  for(i=0; i<3; i++)
76 >    for (j=0; j<3; j++) tempMat[i][j] = 0.0;;
77  
78 <  setFortranBoxSize(Hmat, HmatI, &orthoRhombic);
78 >  tempMat[0][0] = newBox[0];
79 >  tempMat[1][1] = newBox[1];
80 >  tempMat[2][2] = newBox[2];
81  
82 <  smallestBoxL = boxLx;
67 <  if (boxLy < smallestBoxL) smallestBoxL = boxLy;
68 <  if (boxLz < smallestBoxL) smallestBoxL = boxLz;
82 >  setBoxM( tempMat );
83  
70 –  maxCutoff = smallestBoxL / 2.0;
71 –
72 –  if (rList > maxCutoff) {
73 –    sprintf( painCave.errMsg,
74 –             "New Box size is forcing neighborlist radius down to %lf\n",
75 –             maxCutoff );
76 –    painCave.isFatal = 0;
77 –    simError();
78 –
79 –    rList = maxCutoff;
80 –
81 –    sprintf( painCave.errMsg,
82 –             "New Box size is forcing cutoff radius down to %lf\n",
83 –             maxCutoff - 1.0 );
84 –    painCave.isFatal = 0;
85 –    simError();
86 –
87 –    rCut = rList - 1.0;
88 –
89 –    // list radius changed so we have to refresh the simulation structure.
90 –    refreshSim();
91 –  }
92 –
93 –  if (rCut > maxCutoff) {
94 –    sprintf( painCave.errMsg,
95 –             "New Box size is forcing cutoff radius down to %lf\n",
96 –             maxCutoff );
97 –    painCave.isFatal = 0;
98 –    simError();
99 –
100 –    status = 0;
101 –    LJ_new_rcut(&rCut, &status);
102 –    if (status != 0) {
103 –      sprintf( painCave.errMsg,
104 –               "Error in recomputing LJ shifts based on new rcut\n");
105 –      painCave.isFatal = 1;
106 –      simError();
107 –    }
108 –  }
84   }
85  
86 < void SimInfo::setBoxM( double theBox[9] ){
86 > void SimInfo::setBoxM( double theBox[3][3] ){
87    
88 <  int i, status;
88 >  int i, j, status;
89    double smallestBoxL, maxCutoff;
90 +  double FortranHmat[9]; // to preserve compatibility with Fortran the
91 +                         // ordering in the array is as follows:
92 +                         // [ 0 3 6 ]
93 +                         // [ 1 4 7 ]
94 +                         // [ 2 5 8 ]
95 +  double FortranHmatInv[9]; // the inverted Hmat (for Fortran);
96  
97 <  for(i=0; i<9; i++) Hmat[i] = theBox[i];
98 <  calcHmatI();
97 >  
98 >  if( !boxIsInit ) boxIsInit = 1;
99 >
100 >  for(i=0; i < 3; i++)
101 >    for (j=0; j < 3; j++) Hmat[i][j] = theBox[i][j];
102 >  
103    calcBoxL();
104 +  calcHmatInv();
105  
106 <  setFortranBoxSize(Hmat, HmatI, &orthoRhombic);
107 <
108 <  smallestBoxL = boxLx;
109 <  if (boxLy < smallestBoxL) smallestBoxL = boxLy;
124 <  if (boxLz < smallestBoxL) smallestBoxL = boxLz;
125 <
126 <  maxCutoff = smallestBoxL / 2.0;
127 <
128 <  if (rList > maxCutoff) {
129 <    sprintf( painCave.errMsg,
130 <             "New Box size is forcing neighborlist radius down to %lf\n",
131 <             maxCutoff );
132 <    painCave.isFatal = 0;
133 <    simError();
134 <
135 <    rList = maxCutoff;
136 <
137 <    sprintf( painCave.errMsg,
138 <             "New Box size is forcing cutoff radius down to %lf\n",
139 <             maxCutoff - 1.0 );
140 <    painCave.isFatal = 0;
141 <    simError();
142 <
143 <    rCut = rList - 1.0;
144 <
145 <    // list radius changed so we have to refresh the simulation structure.
146 <    refreshSim();
147 <  }
148 <
149 <  if (rCut > maxCutoff) {
150 <    sprintf( painCave.errMsg,
151 <             "New Box size is forcing cutoff radius down to %lf\n",
152 <             maxCutoff );
153 <    painCave.isFatal = 0;
154 <    simError();
155 <
156 <    status = 0;
157 <    LJ_new_rcut(&rCut, &status);
158 <    if (status != 0) {
159 <      sprintf( painCave.errMsg,
160 <               "Error in recomputing LJ shifts based on new rcut\n");
161 <      painCave.isFatal = 1;
162 <      simError();
106 >  for(i=0; i < 3; i++) {
107 >    for (j=0; j < 3; j++) {
108 >      FortranHmat[3*j + i] = Hmat[i][j];
109 >      FortranHmatInv[3*j + i] = HmatInv[i][j];
110      }
111    }
112 +
113 +  setFortranBoxSize(FortranHmat, FortranHmatInv, &orthoRhombic);
114 +
115   }
116  
117  
118 < void SimInfo::getBoxM (double theBox[9]) {
118 > void SimInfo::getBoxM (double theBox[3][3]) {
119  
120 <  int i;
121 <  for(i=0; i<9; i++) theBox[i] = Hmat[i];
120 >  int i, j;
121 >  for(i=0; i<3; i++)
122 >    for (j=0; j<3; j++) theBox[i][j] = Hmat[i][j];
123   }
124  
125  
126   void SimInfo::scaleBox(double scale) {
127 <  double theBox[9];
128 <  int i;
127 >  double theBox[3][3];
128 >  int i, j;
129  
130 <  for(i=0; i<9; i++) theBox[i] = Hmat[i]*scale;
130 >  // cerr << "Scaling box by " << scale << "\n";
131  
132 +  for(i=0; i<3; i++)
133 +    for (j=0; j<3; j++) theBox[i][j] = Hmat[i][j]*scale;
134 +
135    setBoxM(theBox);
136  
137   }
138  
139 < void SimInfo::calcHmatI( void ) {
140 <
141 <  double C[3][3];
188 <  double detHmat;
189 <  int i, j, k;
139 > void SimInfo::calcHmatInv( void ) {
140 >  
141 >  int i,j;
142    double smallDiag;
143    double tol;
144    double sanity[3][3];
145  
146 <  // calculate the adjunct of Hmat;
146 >  invertMat3( Hmat, HmatInv );
147  
148 <  C[0][0] =  ( Hmat[4]*Hmat[8]) - (Hmat[7]*Hmat[5]);
197 <  C[1][0] = -( Hmat[1]*Hmat[8]) + (Hmat[7]*Hmat[2]);
198 <  C[2][0] =  ( Hmat[1]*Hmat[5]) - (Hmat[4]*Hmat[2]);
148 >  // Check the inverse to make sure it is sane:
149  
150 <  C[0][1] = -( Hmat[3]*Hmat[8]) + (Hmat[6]*Hmat[5]);
151 <  C[1][1] =  ( Hmat[0]*Hmat[8]) - (Hmat[6]*Hmat[2]);
152 <  C[2][1] = -( Hmat[0]*Hmat[5]) + (Hmat[3]*Hmat[2]);
203 <
204 <  C[0][2] =  ( Hmat[3]*Hmat[7]) - (Hmat[6]*Hmat[4]);
205 <  C[1][2] = -( Hmat[0]*Hmat[7]) + (Hmat[6]*Hmat[1]);
206 <  C[2][2] =  ( Hmat[0]*Hmat[4]) - (Hmat[3]*Hmat[1]);
207 <
208 <  // calcutlate the determinant of Hmat
150 >  matMul3( Hmat, HmatInv, sanity );
151 >    
152 >  // check to see if Hmat is orthorhombic
153    
154 <  detHmat = 0.0;
155 <  for(i=0; i<3; i++) detHmat += Hmat[i] * C[i][0];
154 >  smallDiag = Hmat[0][0];
155 >  if(smallDiag > Hmat[1][1]) smallDiag = Hmat[1][1];
156 >  if(smallDiag > Hmat[2][2]) smallDiag = Hmat[2][2];
157 >  tol = smallDiag * 1E-6;
158  
159 +  orthoRhombic = 1;
160    
161 <  // H^-1 = C^T / det(H)
162 <  
163 <  i=0;
164 <  for(j=0; j<3; j++){
165 <    for(k=0; k<3; k++){
166 <
167 <      HmatI[i] = C[j][k] / detHmat;
221 <      i++;
161 >  for (i = 0; i < 3; i++ ) {
162 >    for (j = 0 ; j < 3; j++) {
163 >      if (i != j) {
164 >        if (orthoRhombic) {
165 >          if (Hmat[i][j] >= tol) orthoRhombic = 0;
166 >        }        
167 >      }
168      }
169    }
170 + }
171  
172 <  // sanity check
172 > double SimInfo::matDet3(double a[3][3]) {
173 >  int i, j, k;
174 >  double determinant;
175  
176 <  for(i=0; i<3; i++){
177 <    for(j=0; j<3; j++){
176 >  determinant = 0.0;
177 >
178 >  for(i = 0; i < 3; i++) {
179 >    j = (i+1)%3;
180 >    k = (i+2)%3;
181 >
182 >    determinant += a[0][i] * (a[1][j]*a[2][k] - a[1][k]*a[2][j]);
183 >  }
184 >
185 >  return determinant;
186 > }
187 >
188 > void SimInfo::invertMat3(double a[3][3], double b[3][3]) {
189 >  
190 >  int  i, j, k, l, m, n;
191 >  double determinant;
192 >
193 >  determinant = matDet3( a );
194 >
195 >  if (determinant == 0.0) {
196 >    sprintf( painCave.errMsg,
197 >             "Can't invert a matrix with a zero determinant!\n");
198 >    painCave.isFatal = 1;
199 >    simError();
200 >  }
201 >
202 >  for (i=0; i < 3; i++) {
203 >    j = (i+1)%3;
204 >    k = (i+2)%3;
205 >    for(l = 0; l < 3; l++) {
206 >      m = (l+1)%3;
207 >      n = (l+2)%3;
208        
209 <      sanity[i][j] = 0.0;
231 <      for(k=0; k<3; k++){
232 <        sanity[i][j] += Hmat[3*k+i] * HmatI[3*j+k];
233 <      }
209 >      b[l][i] = (a[j][m]*a[k][n] - a[j][n]*a[k][m]) / determinant;
210      }
211    }
212 + }
213  
214 <  cerr << "sanity => \n"
215 <       << sanity[0][0] << "\t" << sanity[0][1] << "\t" << sanity [0][2] << "\n"
239 <       << sanity[1][0] << "\t" << sanity[1][1] << "\t" << sanity [1][2] << "\n"
240 <       << sanity[2][0] << "\t" << sanity[2][1] << "\t" << sanity [2][2]
241 <       << "\n";
242 <    
214 > void SimInfo::matMul3(double a[3][3], double b[3][3], double c[3][3]) {
215 >  double r00, r01, r02, r10, r11, r12, r20, r21, r22;
216  
217 <  // check to see if Hmat is orthorhombic
217 >  r00 = a[0][0]*b[0][0] + a[0][1]*b[1][0] + a[0][2]*b[2][0];
218 >  r01 = a[0][0]*b[0][1] + a[0][1]*b[1][1] + a[0][2]*b[2][1];
219 >  r02 = a[0][0]*b[0][2] + a[0][1]*b[1][2] + a[0][2]*b[2][2];
220    
221 <  smallDiag = Hmat[0];
222 <  if(smallDiag > Hmat[4]) smallDiag = Hmat[4];
223 <  if(smallDiag > Hmat[8]) smallDiag = Hmat[8];
224 <  tol = smallDiag * 1E-6;
221 >  r10 = a[1][0]*b[0][0] + a[1][1]*b[1][0] + a[1][2]*b[2][0];
222 >  r11 = a[1][0]*b[0][1] + a[1][1]*b[1][1] + a[1][2]*b[2][1];
223 >  r12 = a[1][0]*b[0][2] + a[1][1]*b[1][2] + a[1][2]*b[2][2];
224 >  
225 >  r20 = a[2][0]*b[0][0] + a[2][1]*b[1][0] + a[2][2]*b[2][0];
226 >  r21 = a[2][0]*b[0][1] + a[2][1]*b[1][1] + a[2][2]*b[2][1];
227 >  r22 = a[2][0]*b[0][2] + a[2][1]*b[1][2] + a[2][2]*b[2][2];
228 >  
229 >  c[0][0] = r00; c[0][1] = r01; c[0][2] = r02;
230 >  c[1][0] = r10; c[1][1] = r11; c[1][2] = r12;
231 >  c[2][0] = r20; c[2][1] = r21; c[2][2] = r22;
232 > }
233  
234 <  orthoRhombic = 1;
235 <  for(i=0; (i<9) && orthoRhombic; i++){
236 <    
237 <    if( (i%4) ){ // ignore the diagonals (0, 4, and 8)
238 <      orthoRhombic = (Hmat[i] <= tol);
234 > void SimInfo::matVecMul3(double m[3][3], double inVec[3], double outVec[3]) {
235 >  double a0, a1, a2;
236 >
237 >  a0 = inVec[0];  a1 = inVec[1];  a2 = inVec[2];
238 >
239 >  outVec[0] = m[0][0]*a0 + m[0][1]*a1 + m[0][2]*a2;
240 >  outVec[1] = m[1][0]*a0 + m[1][1]*a1 + m[1][2]*a2;
241 >  outVec[2] = m[2][0]*a0 + m[2][1]*a1 + m[2][2]*a2;
242 > }
243 >
244 > void SimInfo::transposeMat3(double in[3][3], double out[3][3]) {
245 >  double temp[3][3];
246 >  int i, j;
247 >
248 >  for (i = 0; i < 3; i++) {
249 >    for (j = 0; j < 3; j++) {
250 >      temp[j][i] = in[i][j];
251      }
252    }
253 <    
253 >  for (i = 0; i < 3; i++) {
254 >    for (j = 0; j < 3; j++) {
255 >      out[i][j] = temp[i][j];
256 >    }
257 >  }
258   }
259 +  
260 + void SimInfo::printMat3(double A[3][3] ){
261  
262 +  std::cerr
263 +            << "[ " << A[0][0] << ", " << A[0][1] << ", " << A[0][2] << " ]\n"
264 +            << "[ " << A[1][0] << ", " << A[1][1] << ", " << A[1][2] << " ]\n"
265 +            << "[ " << A[2][0] << ", " << A[2][1] << ", " << A[2][2] << " ]\n";
266 + }
267 +
268 + void SimInfo::printMat9(double A[9] ){
269 +
270 +  std::cerr
271 +            << "[ " << A[0] << ", " << A[1] << ", " << A[2] << " ]\n"
272 +            << "[ " << A[3] << ", " << A[4] << ", " << A[5] << " ]\n"
273 +            << "[ " << A[6] << ", " << A[7] << ", " << A[8] << " ]\n";
274 + }
275 +
276   void SimInfo::calcBoxL( void ){
277  
278    double dx, dy, dz, dsq;
279    int i;
280  
281 <  // boxVol = h1 (dot) h2 (cross) h3
281 >  // boxVol = Determinant of Hmat
282  
283 <  boxVol = Hmat[0] * ( (Hmat[4]*Hmat[8]) - (Hmat[7]*Hmat[5]) )
269 <         + Hmat[1] * ( (Hmat[5]*Hmat[6]) - (Hmat[8]*Hmat[3]) )
270 <         + Hmat[2] * ( (Hmat[3]*Hmat[7]) - (Hmat[6]*Hmat[4]) );
283 >  boxVol = matDet3( Hmat );
284  
272 –
285    // boxLx
286    
287 <  dx = Hmat[0]; dy = Hmat[1]; dz = Hmat[2];
287 >  dx = Hmat[0][0]; dy = Hmat[1][0]; dz = Hmat[2][0];
288    dsq = dx*dx + dy*dy + dz*dz;
289 <  boxLx = sqrt( dsq );
289 >  boxL[0] = sqrt( dsq );
290 >  maxCutoff = 0.5 * boxL[0];
291  
292    // boxLy
293    
294 <  dx = Hmat[3]; dy = Hmat[4]; dz = Hmat[5];
294 >  dx = Hmat[0][1]; dy = Hmat[1][1]; dz = Hmat[2][1];
295    dsq = dx*dx + dy*dy + dz*dz;
296 <  boxLy = sqrt( dsq );
296 >  boxL[1] = sqrt( dsq );
297 >  if( (0.5 * boxL[1]) < maxCutoff ) maxCutoff = 0.5 * boxL[1];
298  
299    // boxLz
300    
301 <  dx = Hmat[6]; dy = Hmat[7]; dz = Hmat[8];
301 >  dx = Hmat[0][2]; dy = Hmat[1][2]; dz = Hmat[2][2];
302    dsq = dx*dx + dy*dy + dz*dz;
303 <  boxLz = sqrt( dsq );
303 >  boxL[2] = sqrt( dsq );
304 >  if( (0.5 * boxL[2]) < maxCutoff ) maxCutoff = 0.5 * boxL[2];
305    
306 +  checkCutOffs();
307 +
308   }
309  
310  
# Line 298 | Line 315 | void SimInfo::wrapVector( double thePos[3] ){
315  
316    if( !orthoRhombic ){
317      // calc the scaled coordinates.
318 +  
319 +
320 +    matVecMul3(HmatInv, thePos, scaled);
321      
322      for(i=0; i<3; i++)
303 –      scaled[i] =
304 –        thePos[0]*HmatI[i] + thePos[1]*HmatI[i+3] + thePos[3]*HmatI[i+6];
305 –    
306 –    // wrap the scaled coordinates
307 –    
308 –    for(i=0; i<3; i++)
323        scaled[i] -= roundMe(scaled[i]);
324      
325      // calc the wrapped real coordinates from the wrapped scaled coordinates
326      
327 <    for(i=0; i<3; i++)
328 <      thePos[i] =
315 <        scaled[0]*Hmat[i] + scaled[1]*Hmat[i+3] + scaled[2]*Hmat[i+6];
327 >    matVecMul3(Hmat, scaled, thePos);
328 >
329    }
330    else{
331      // calc the scaled coordinates.
332      
333      for(i=0; i<3; i++)
334 <      scaled[i] = thePos[i]*HmatI[i*4];
334 >      scaled[i] = thePos[i]*HmatInv[i][i];
335      
336      // wrap the scaled coordinates
337      
# Line 328 | Line 341 | void SimInfo::wrapVector( double thePos[3] ){
341      // calc the wrapped real coordinates from the wrapped scaled coordinates
342      
343      for(i=0; i<3; i++)
344 <      thePos[i] = scaled[i]*Hmat[i*4];
344 >      thePos[i] = scaled[i]*Hmat[i][i];
345    }
346      
334 –    
347   }
348  
349  
# Line 372 | Line 384 | void SimInfo::refreshSim(){
384    int isError;
385    int n_global;
386    int* excl;
387 <  
376 <  fInfo.rrf = 0.0;
377 <  fInfo.rt = 0.0;
387 >
388    fInfo.dielect = 0.0;
389  
380 –  fInfo.rlist = rList;
381 –  fInfo.rcut = rCut;
382 –
390    if( useDipole ){
384 –    fInfo.rrf = ecr;
385 –    fInfo.rt = ecr - est;
391      if( useReactionField )fInfo.dielect = dielectric;
392    }
393  
# Line 428 | Line 433 | void SimInfo::refreshSim(){
433  
434    this->ndf = this->getNDF();
435    this->ndfRaw = this->getNDFraw();
436 +
437 + }
438 +
439 +
440 + void SimInfo::setRcut( double theRcut ){
441 +
442 +  if( !haveOrigRcut ){
443 +    haveOrigRcut = 1;
444 +    origRcut = theRcut;
445 +  }
446 +
447 +  rCut = theRcut;
448 +  checkCutOffs();
449 + }
450 +
451 + void SimInfo::setEcr( double theEcr ){
452 +
453 +  if( !haveOrigEcr ){
454 +    haveOrigEcr = 1;
455 +    origEcr = theEcr;
456 +  }
457 +
458 +  ecr = theEcr;
459 +  checkCutOffs();
460 + }
461 +
462 + void SimInfo::setEcr( double theEcr, double theEst ){
463  
464 +  est = theEst;
465 +  setEcr( theEcr );
466   }
467  
468 +
469 + void SimInfo::checkCutOffs( void ){
470 +
471 +  int cutChanged = 0;
472 +
473 +
474 +
475 +  if( boxIsInit ){
476 +    
477 +    //we need to check cutOffs against the box
478 +  
479 +    if(( maxCutoff > rCut )&&(usePBC)){
480 +      if( rCut < origRcut ){
481 +        rCut = origRcut;
482 +        if (rCut > maxCutoff) rCut = maxCutoff;
483 +        
484 +        sprintf( painCave.errMsg,
485 +                 "New Box size is setting the long range cutoff radius "
486 +                 "to %lf\n",
487 +                 rCut );
488 +        painCave.isFatal = 0;
489 +        simError();
490 +      }
491 +    }
492 +
493 +    if( maxCutoff > ecr ){
494 +      if( ecr < origEcr ){
495 +        rCut = origEcr;
496 +        if (ecr > maxCutoff) ecr = maxCutoff;
497 +        
498 +        sprintf( painCave.errMsg,
499 +                 "New Box size is setting the electrostaticCutoffRadius "
500 +                 "to %lf\n",
501 +                 ecr );
502 +        painCave.isFatal = 0;
503 +        simError();
504 +      }
505 +    }
506 +
507 +
508 +    if ((rCut > maxCutoff)&&(usePBC)) {
509 +      sprintf( painCave.errMsg,
510 +               "New Box size is setting the long range cutoff radius "
511 +               "to %lf\n",
512 +               maxCutoff );
513 +      painCave.isFatal = 0;
514 +      simError();
515 +      rCut = maxCutoff;
516 +    }
517 +
518 +    if( ecr > maxCutoff){
519 +      sprintf( painCave.errMsg,
520 +               "New Box size is setting the electrostaticCutoffRadius "
521 +               "to %lf\n",
522 +               maxCutoff  );
523 +      painCave.isFatal = 0;
524 +      simError();      
525 +      ecr = maxCutoff;
526 +    }
527 +
528 +    
529 +  }
530 +  
531 +
532 +  if( (oldEcr != ecr) || ( oldRcut != rCut ) ) cutChanged = 1;
533 +
534 +  // rlist is the 1.0 plus max( rcut, ecr )
535 +  
536 +  ( rCut > ecr )? rList = rCut + 1.0: rList = ecr + 1.0;
537 +
538 +  if( cutChanged ){
539 +    
540 +    notifyFortranCutOffs( &rCut, &rList, &ecr, &est );
541 +  }
542 +
543 +  oldEcr = ecr;
544 +  oldRcut = rCut;
545 + }
546 +
547 + void SimInfo::addProperty(GenericData* prop){
548 +
549 +  map<string, GenericData*>::iterator result;
550 +  result = properties.find(prop->getID());
551 +  
552 +  //we can't simply use  properties[prop->getID()] = prop,
553 +  //it will cause memory leak if we already contain a propery which has the same name of prop
554 +  
555 +  if(result != properties.end()){
556 +    
557 +    delete (*result).second;
558 +    (*result).second = prop;
559 +      
560 +  }
561 +  else{
562 +
563 +    properties[prop->getID()] = prop;
564 +
565 +  }
566 +    
567 + }
568 +
569 + GenericData* SimInfo::getProperty(const string& propName){
570 +
571 +  map<string, GenericData*>::iterator result;
572 +  
573 +  //string lowerCaseName = ();
574 +  
575 +  result = properties.find(propName);
576 +  
577 +  if(result != properties.end())
578 +    return (*result).second;  
579 +  else  
580 +    return NULL;  
581 + }
582 +
583 + vector<GenericData*> SimInfo::getProperties(){
584 +
585 +  vector<GenericData*> result;
586 +  map<string, GenericData*>::iterator i;
587 +  
588 +  for(i = properties.begin(); i != properties.end(); i++)
589 +    result.push_back((*i).second);
590 +    
591 +  return result;
592 + }
593 +
594 +

Diff Legend

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