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 860 by mmeineke, Tue Nov 11 17:20:12 2003 UTC vs.
Revision 1127 by tim, Tue Apr 20 16:56:40 2004 UTC

# Line 12 | Line 12 | using namespace std;
12  
13   #include "fortranWrappers.hpp"
14  
15 + #include "MatVec3.h"
16 +
17   #ifdef IS_MPI
18   #include "mpiSimulation.hpp"
19   #endif
# Line 27 | Line 29 | SimInfo::SimInfo(){
29   SimInfo* currentInfo;
30  
31   SimInfo::SimInfo(){
32 <  excludes = NULL;
32 >
33    n_constraints = 0;
34    nZconstraints = 0;
35    n_oriented = 0;
# Line 49 | Line 51 | SimInfo::SimInfo(){
51    
52    resetTime = 1e99;
53  
54 +  orthoRhombic = 0;
55    orthoTolerance = 1E-6;
56    useInitXSstate = true;
57  
58    usePBC = 0;
59    useLJ = 0;
60    useSticky = 0;
61 <  useDipole = 0;
61 >  useCharges = 0;
62 >  useDipoles = 0;
63    useReactionField = 0;
64    useGB = 0;
65    useEAM = 0;
66  
67 +  excludes = Exclude::Instance();
68 +
69    myConfiguration = new SimState();
70  
71 +  has_minimizer = false;
72 +  the_minimizer =NULL;
73 +
74    wrapMeSimInfo( this );
75   }
76  
# Line 179 | Line 188 | void SimInfo::calcHmatInv( void ) {
188      
189      if( orthoRhombic ){
190        sprintf( painCave.errMsg,
191 <               "Hmat is switching from Non-Orthorhombic to OrthoRhombic\n"
192 <               "       If this is a bad thing, change the orthoBoxTolerance( currently %G ).\n",
191 >               "OOPSE is switching from the default Non-Orthorhombic\n"
192 >               "\tto the faster Orthorhombic periodic boundary computations.\n"
193 >               "\tThis is usually a good thing, but if you wan't the\n"
194 >               "\tNon-Orthorhombic computations, make the orthoBoxTolerance\n"
195 >               "\tvariable ( currently set to %G ) smaller.\n",
196                 orthoTolerance);
197        simError();
198      }
199      else {
200        sprintf( painCave.errMsg,
201 <               "Hmat is switching from Orthorhombic to Non-OrthoRhombic\n"
202 <               "       If this is a bad thing, change the orthoBoxTolerance( currently %G ).\n",
201 >               "OOPSE is switching from the faster Orthorhombic to the more\n"
202 >               "\tflexible Non-Orthorhombic periodic boundary computations.\n"
203 >               "\tThis is usually because the box has deformed under\n"
204 >               "\tNPTf integration. If you wan't to live on the edge with\n"
205 >               "\tthe Orthorhombic computations, make the orthoBoxTolerance\n"
206 >               "\tvariable ( currently set to %G ) larger.\n",
207                 orthoTolerance);
208        simError();
193 –    }
194 –  }
195 – }
196 –
197 – double SimInfo::matDet3(double a[3][3]) {
198 –  int i, j, k;
199 –  double determinant;
200 –
201 –  determinant = 0.0;
202 –
203 –  for(i = 0; i < 3; i++) {
204 –    j = (i+1)%3;
205 –    k = (i+2)%3;
206 –
207 –    determinant += a[0][i] * (a[1][j]*a[2][k] - a[1][k]*a[2][j]);
208 –  }
209 –
210 –  return determinant;
211 – }
212 –
213 – void SimInfo::invertMat3(double a[3][3], double b[3][3]) {
214 –  
215 –  int  i, j, k, l, m, n;
216 –  double determinant;
217 –
218 –  determinant = matDet3( a );
219 –
220 –  if (determinant == 0.0) {
221 –    sprintf( painCave.errMsg,
222 –             "Can't invert a matrix with a zero determinant!\n");
223 –    painCave.isFatal = 1;
224 –    simError();
225 –  }
226 –
227 –  for (i=0; i < 3; i++) {
228 –    j = (i+1)%3;
229 –    k = (i+2)%3;
230 –    for(l = 0; l < 3; l++) {
231 –      m = (l+1)%3;
232 –      n = (l+2)%3;
233 –      
234 –      b[l][i] = (a[j][m]*a[k][n] - a[j][n]*a[k][m]) / determinant;
235 –    }
236 –  }
237 – }
238 –
239 – void SimInfo::matMul3(double a[3][3], double b[3][3], double c[3][3]) {
240 –  double r00, r01, r02, r10, r11, r12, r20, r21, r22;
241 –
242 –  r00 = a[0][0]*b[0][0] + a[0][1]*b[1][0] + a[0][2]*b[2][0];
243 –  r01 = a[0][0]*b[0][1] + a[0][1]*b[1][1] + a[0][2]*b[2][1];
244 –  r02 = a[0][0]*b[0][2] + a[0][1]*b[1][2] + a[0][2]*b[2][2];
245 –  
246 –  r10 = a[1][0]*b[0][0] + a[1][1]*b[1][0] + a[1][2]*b[2][0];
247 –  r11 = a[1][0]*b[0][1] + a[1][1]*b[1][1] + a[1][2]*b[2][1];
248 –  r12 = a[1][0]*b[0][2] + a[1][1]*b[1][2] + a[1][2]*b[2][2];
249 –  
250 –  r20 = a[2][0]*b[0][0] + a[2][1]*b[1][0] + a[2][2]*b[2][0];
251 –  r21 = a[2][0]*b[0][1] + a[2][1]*b[1][1] + a[2][2]*b[2][1];
252 –  r22 = a[2][0]*b[0][2] + a[2][1]*b[1][2] + a[2][2]*b[2][2];
253 –  
254 –  c[0][0] = r00; c[0][1] = r01; c[0][2] = r02;
255 –  c[1][0] = r10; c[1][1] = r11; c[1][2] = r12;
256 –  c[2][0] = r20; c[2][1] = r21; c[2][2] = r22;
257 – }
258 –
259 – void SimInfo::matVecMul3(double m[3][3], double inVec[3], double outVec[3]) {
260 –  double a0, a1, a2;
261 –
262 –  a0 = inVec[0];  a1 = inVec[1];  a2 = inVec[2];
263 –
264 –  outVec[0] = m[0][0]*a0 + m[0][1]*a1 + m[0][2]*a2;
265 –  outVec[1] = m[1][0]*a0 + m[1][1]*a1 + m[1][2]*a2;
266 –  outVec[2] = m[2][0]*a0 + m[2][1]*a1 + m[2][2]*a2;
267 – }
268 –
269 – void SimInfo::transposeMat3(double in[3][3], double out[3][3]) {
270 –  double temp[3][3];
271 –  int i, j;
272 –
273 –  for (i = 0; i < 3; i++) {
274 –    for (j = 0; j < 3; j++) {
275 –      temp[j][i] = in[i][j];
209      }
210    }
278 –  for (i = 0; i < 3; i++) {
279 –    for (j = 0; j < 3; j++) {
280 –      out[i][j] = temp[i][j];
281 –    }
282 –  }
283 – }
284 –  
285 – void SimInfo::printMat3(double A[3][3] ){
286 –
287 –  std::cerr
288 –            << "[ " << A[0][0] << ", " << A[0][1] << ", " << A[0][2] << " ]\n"
289 –            << "[ " << A[1][0] << ", " << A[1][1] << ", " << A[1][2] << " ]\n"
290 –            << "[ " << A[2][0] << ", " << A[2][1] << ", " << A[2][2] << " ]\n";
291 – }
292 –
293 – void SimInfo::printMat9(double A[9] ){
294 –
295 –  std::cerr
296 –            << "[ " << A[0] << ", " << A[1] << ", " << A[2] << " ]\n"
297 –            << "[ " << A[3] << ", " << A[4] << ", " << A[5] << " ]\n"
298 –            << "[ " << A[6] << ", " << A[7] << ", " << A[8] << " ]\n";
299 – }
300 –
301 –
302 – void SimInfo::crossProduct3(double a[3],double b[3], double out[3]){
303 –
304 –      out[0] = a[1] * b[2] - a[2] * b[1];
305 –      out[1] = a[2] * b[0] - a[0] * b[2] ;
306 –      out[2] = a[0] * b[1] - a[1] * b[0];
307 –      
211   }
212  
310 – double SimInfo::dotProduct3(double a[3], double b[3]){
311 –  return a[0]*b[0] + a[1]*b[1]+ a[2]*b[2];
312 – }
313 –
314 – double SimInfo::length3(double a[3]){
315 –  return sqrt(a[0]*a[0] + a[1]*a[1] + a[2]*a[2]);
316 – }
317 –
213   void SimInfo::calcBoxL( void ){
214  
215    double dx, dy, dz, dsq;
# Line 370 | Line 265 | double SimInfo::calcMaxCutOff(){
265    rk[0] = Hmat[0][2];
266    rk[1] = Hmat[1][2];
267    rk[2] = Hmat[2][2];
268 <  
269 <  crossProduct3(ri,rj, rij);
270 <  distXY = dotProduct3(rk,rij) / length3(rij);
268 >    
269 >  crossProduct3(ri, rj, rij);
270 >  distXY = dotProduct3(rk,rij) / norm3(rij);
271  
272    crossProduct3(rj,rk, rjk);
273 <  distYZ = dotProduct3(ri,rjk) / length3(rjk);
273 >  distYZ = dotProduct3(ri,rjk) / norm3(rjk);
274  
275    crossProduct3(rk,ri, rki);
276 <  distZX = dotProduct3(rj,rki) / length3(rki);
276 >  distZX = dotProduct3(rj,rki) / norm3(rki);
277  
278    minDist = min(min(distXY, distYZ), distZX);
279    return minDist/2;
# Line 426 | Line 321 | int SimInfo::getNDF(){
321  
322   int SimInfo::getNDF(){
323    int ndf_local;
324 +
325 +  ndf_local = 0;
326    
327 <  ndf_local = 3 * n_atoms + 3 * n_oriented - n_constraints;
327 >  for(int i = 0; i < integrableObjects.size(); i++){
328 >    ndf_local += 3;
329 >    if (integrableObjects[i]->isDirectional()) {
330 >      if (integrableObjects[i]->isLinear())
331 >        ndf_local += 2;
332 >      else
333 >        ndf_local += 3;
334 >    }
335 >  }
336  
337 +  // n_constraints is local, so subtract them on each processor:
338 +
339 +  ndf_local -= n_constraints;
340 +
341   #ifdef IS_MPI
342    MPI_Allreduce(&ndf_local,&ndf,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
343   #else
344    ndf = ndf_local;
345   #endif
346  
347 +  // nZconstraints is global, as are the 3 COM translations for the
348 +  // entire system:
349 +
350    ndf = ndf - 3 - nZconstraints;
351  
352    return ndf;
# Line 444 | Line 356 | int SimInfo::getNDFraw() {
356    int ndfRaw_local;
357  
358    // Raw degrees of freedom that we have to set
359 <  ndfRaw_local = 3 * n_atoms + 3 * n_oriented;
360 <  
359 >  ndfRaw_local = 0;
360 >
361 >  for(int i = 0; i < integrableObjects.size(); i++){
362 >    ndfRaw_local += 3;
363 >    if (integrableObjects[i]->isDirectional()) {
364 >       if (integrableObjects[i]->isLinear())
365 >        ndfRaw_local += 2;
366 >      else
367 >        ndfRaw_local += 3;
368 >    }
369 >  }
370 >    
371   #ifdef IS_MPI
372    MPI_Allreduce(&ndfRaw_local,&ndfRaw,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
373   #else
# Line 458 | Line 380 | int SimInfo::getNDFtranslational() {
380   int SimInfo::getNDFtranslational() {
381    int ndfTrans_local;
382  
383 <  ndfTrans_local = 3 * n_atoms - n_constraints;
383 >  ndfTrans_local = 3 * integrableObjects.size() - n_constraints;
384  
385 +
386   #ifdef IS_MPI
387    MPI_Allreduce(&ndfTrans_local,&ndfTrans,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
388   #else
# Line 471 | Line 394 | void SimInfo::refreshSim(){
394    return ndfTrans;
395   }
396  
397 + int SimInfo::getTotIntegrableObjects() {
398 +  int nObjs_local;
399 +  int nObjs;
400 +
401 +  nObjs_local =  integrableObjects.size();
402 +
403 +
404 + #ifdef IS_MPI
405 +  MPI_Allreduce(&nObjs_local,&nObjs,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
406 + #else
407 +  nObjs = nObjs_local;
408 + #endif
409 +
410 +
411 +  return nObjs;
412 + }
413 +
414   void SimInfo::refreshSim(){
415  
416    simtype fInfo;
# Line 480 | Line 420 | void SimInfo::refreshSim(){
420  
421    fInfo.dielect = 0.0;
422  
423 <  if( useDipole ){
423 >  if( useDipoles ){
424      if( useReactionField )fInfo.dielect = dielectric;
425    }
426  
# Line 489 | Line 429 | void SimInfo::refreshSim(){
429    fInfo.SIM_uses_LJ = useLJ;
430    fInfo.SIM_uses_sticky = useSticky;
431    //fInfo.SIM_uses_sticky = 0;
432 <  fInfo.SIM_uses_dipoles = useDipole;
432 >  fInfo.SIM_uses_charges = useCharges;
433 >  fInfo.SIM_uses_dipoles = useDipoles;
434    //fInfo.SIM_uses_dipoles = 0;
435 <  //fInfo.SIM_uses_RF = useReactionField;
436 <  fInfo.SIM_uses_RF = 0;
435 >  fInfo.SIM_uses_RF = useReactionField;
436 >  //fInfo.SIM_uses_RF = 0;
437    fInfo.SIM_uses_GB = useGB;
438    fInfo.SIM_uses_EAM = useEAM;
439  
440 <  excl = Exclude::getArray();
440 >  n_exclude = excludes->getSize();
441 >  excl = excludes->getFortranArray();
442  
443   #ifdef IS_MPI
444    n_global = mpiSim->getTotAtoms();
# Line 542 | Line 484 | void SimInfo::setDefaultEcr( double theEcr ){
484   void SimInfo::setDefaultEcr( double theEcr ){
485  
486    haveEcr = 1;
487 +  ecr = theEcr;
488    
489    ( rCut > ecr )? rList = rCut + 1.0: rList = ecr + 1.0;
490  
548 –  ecr = theEcr;
549 –
491    notifyFortranCutOffs( &rCut, &rList, &ecr, &est );
492   }
493  
# Line 565 | Line 506 | void SimInfo::checkCutOffs( void ){
506      
507      if( rCut > maxCutoff ){
508        sprintf( painCave.errMsg,
509 <               "Box size is too small for the long range cutoff radius, "
510 <               "%lf, at time %lf\n",
511 <               rCut, currentTime );
509 >               "LJrcut is too large for the current periodic box.\n"
510 >               "\tCurrent Value of LJrcut = %G at time %G\n "
511 >               "\tThis is larger than half of at least one of the\n"
512 >               "\tperiodic box vectors.  Right now, the Box matrix is:\n"
513 >               "\n, %G"
514 >               "\t[ %G %G %G ]\n"
515 >               "\t[ %G %G %G ]\n"
516 >               "\t[ %G %G %G ]\n",
517 >               rCut, currentTime, maxCutoff,
518 >               Hmat[0][0], Hmat[0][1], Hmat[0][2],
519 >               Hmat[1][0], Hmat[1][1], Hmat[1][2],
520 >               Hmat[2][0], Hmat[2][1], Hmat[2][2]);
521        painCave.isFatal = 1;
522        simError();
523      }
# Line 575 | Line 525 | void SimInfo::checkCutOffs( void ){
525      if( haveEcr ){
526        if( ecr > maxCutoff ){
527          sprintf( painCave.errMsg,
528 <                 "Box size is too small for the electrostatic cutoff radius, "
529 <                 "%lf, at time %lf\n",
530 <                 ecr, currentTime );
528 >                 "electrostaticCutoffRadius is too large for the current\n"
529 >                 "\tperiodic box.\n\n"
530 >                 "\tCurrent Value of ECR = %G at time %G\n "
531 >                 "\tThis is larger than half of at least one of the\n"
532 >                 "\tperiodic box vectors.  Right now, the Box matrix is:\n"
533 >                 "\n"
534 >                 "\t[ %G %G %G ]\n"
535 >                 "\t[ %G %G %G ]\n"
536 >                 "\t[ %G %G %G ]\n",
537 >                 ecr, currentTime,
538 >                 Hmat[0][0], Hmat[0][1], Hmat[0][2],
539 >                 Hmat[1][0], Hmat[1][1], Hmat[1][2],
540 >                 Hmat[2][0], Hmat[2][1], Hmat[2][2]);
541          painCave.isFatal = 1;
542          simError();
543        }
# Line 585 | Line 545 | void SimInfo::checkCutOffs( void ){
545    } else {
546      // initialize this stuff before using it, OK?
547      sprintf( painCave.errMsg,
548 <             "Trying to check cutoffs without a box. Be smarter.\n" );
548 >             "Trying to check cutoffs without a box.\n"
549 >             "\tOOPSE should have better programmers than that.\n" );
550      painCave.isFatal = 1;
551      simError();      
552    }
# Line 628 | Line 589 | vector<GenericData*> SimInfo::getProperties(){
589      return NULL;  
590   }
591  
631 – vector<GenericData*> SimInfo::getProperties(){
632 –
633 –  vector<GenericData*> result;
634 –  map<string, GenericData*>::iterator i;
635 –  
636 –  for(i = properties.begin(); i != properties.end(); i++)
637 –    result.push_back((*i).second);
638 –    
639 –  return result;
640 – }
641 –
642 – double SimInfo::matTrace3(double m[3][3]){
643 –  double trace;
644 –  trace = m[0][0] + m[1][1] + m[2][2];
645 –
646 –  return trace;
647 – }

Diff Legend

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