ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/branches/new_design/OOPSE-2.0/src/brains/SimInfo.cpp
(Generate patch)

Comparing:
trunk/OOPSE-2.0/src/brains/SimInfo.cpp (file contents), Revision 1490 by gezelter, Fri Sep 24 04:16:43 2004 UTC vs.
branches/new_design/OOPSE-2.0/src/brains/SimInfo.cpp (file contents), Revision 1725 by tim, Wed Nov 10 22:01:06 2004 UTC

# Line 1 | Line 1
1 < #include <stdlib.h>
2 < #include <string.h>
3 < #include <math.h>
1 > /*
2 > * Copyright (C) 2000-2004  Object Oriented Parallel Simulation Engine (OOPSE) project
3 > *
4 > * Contact: oopse@oopse.org
5 > *
6 > * This program is free software; you can redistribute it and/or
7 > * modify it under the terms of the GNU Lesser General Public License
8 > * as published by the Free Software Foundation; either version 2.1
9 > * of the License, or (at your option) any later version.
10 > * All we ask is that proper credit is given for our work, which includes
11 > * - but is not limited to - adding the above copyright notice to the beginning
12 > * of your source code files, and to any copyright notice that you may distribute
13 > * with programs based on this work.
14 > *
15 > * This program is distributed in the hope that it will be useful,
16 > * but WITHOUT ANY WARRANTY; without even the implied warranty of
17 > * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
18 > * GNU Lesser General Public License for more details.
19 > *
20 > * You should have received a copy of the GNU Lesser General Public License
21 > * along with this program; if not, write to the Free Software
22 > * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
23 > *
24 > */
25  
26 < #include <iostream>
27 < using namespace std;
26 > /**
27 > * @file SimInfo.cpp
28 > * @author    tlin
29 > * @date  11/02/2004
30 > * @version 1.0
31 > */
32  
33 < #include "SimInfo.hpp"
9 < #define __C
10 < #include "fSimulation.h"
11 < #include "simError.h"
33 > #include <algorithm>
34  
35 < #include "fortranWrappers.hpp"
35 > #include "brains/SimInfo.hpp"
36 > #include "utils/MemoryUtils.hpp"
37  
38 < #include "MatVec3.h"
38 > namespace oopse {
39  
40 < #ifdef IS_MPI
41 < #include "mpiSimulation.hpp"
19 < #endif
40 > SimInfo::SimInfo() : nAtoms_(0), nBonds_(0), nBends_(0), nTorsions_(0), nRigidBodies_(0),
41 >        nIntegrableObjects_(0), nCutoffGroups_(0), nConstraints_(0), sman_(NULL){
42  
21 inline double roundMe( double x ){
22  return ( x >= 0 ) ? floor( x + 0.5 ) : ceil( x - 0.5 );
43   }
24          
25 inline double min( double a, double b ){
26  return (a < b ) ? a : b;
27 }
44  
45 < SimInfo* currentInfo;
45 > SimInfo::~SimInfo() {
46 >    MemoryUtils::deleteVectorOfPointer(molecules_);
47 >    delete sman_;
48  
31 SimInfo::SimInfo(){
32
33  n_constraints = 0;
34  nZconstraints = 0;
35  n_oriented = 0;
36  n_dipoles = 0;
37  ndf = 0;
38  ndfRaw = 0;
39  nZconstraints = 0;
40  the_integrator = NULL;
41  setTemp = 0;
42  thermalTime = 0.0;
43  currentTime = 0.0;
44  rCut = 0.0;
45  rSw = 0.0;
46
47  haveRcut = 0;
48  haveRsw = 0;
49  boxIsInit = 0;
50  
51  resetTime = 1e99;
52
53  orthoRhombic = 0;
54  orthoTolerance = 1E-6;
55  useInitXSstate = true;
56
57  usePBC = 0;
58  useLJ = 0;
59  useSticky = 0;
60  useCharges = 0;
61  useDipoles = 0;
62  useReactionField = 0;
63  useGB = 0;
64  useEAM = 0;
65  useSolidThermInt = 0;
66  useLiquidThermInt = 0;
67
68  haveCutoffGroups = false;
69
70  excludes = Exclude::Instance();
71
72  myConfiguration = new SimState();
73
74  has_minimizer = false;
75  the_minimizer =NULL;
76
77  ngroup = 0;
78
79  wrapMeSimInfo( this );
49   }
50  
51  
52 < SimInfo::~SimInfo(){
52 > bool SimInfo::addMolecule(Molecule* mol) {
53 >    std::vector<Molecule*>::iterator i;
54 >    i = std::find(molecules_.begin(), molecules_.end(), mol);
55 >    if (i != molecules_.end() ) {
56 >        molecules_.push_back(mol);
57  
58 <  delete myConfiguration;
58 >        nAtoms_ += mol->getNAtoms();
59 >        nBonds_ += mol->getNBonds();
60 >        nBends_ += mol->getNBends();
61 >        nTorsions_ += mol->getNTorsions();
62 >        nRigidBodies_ += mol->getNRigidBodies();
63 >        nIntegrableObjects_ += mol->getNIntegrableObjects();
64 >        nCutoffGroups_ += mol->getNCutoffGroups();
65 >        nConstraints_ += mol->getNConstraints();
66  
67 <  map<string, GenericData*>::iterator i;
68 <  
69 <  for(i = properties.begin(); i != properties.end(); i++)
70 <    delete (*i).second;
71 <
67 >        globalIndexToMol_.insert(make_pair(mol->getGlobalIndex(), mol));
68 >        return true;
69 >    } else {
70 >        return false;
71 >    }
72   }
73  
74 < void SimInfo::setBox(double newBox[3]) {
75 <  
76 <  int i, j;
97 <  double tempMat[3][3];
74 > bool SimInfo::removeMolecule(Molecule* mol) {
75 >    std::vector<Molecule*>::iterator i;
76 >    i = std::find(molecules_.begin(), molecules_.end(), mol);
77  
78 <  for(i=0; i<3; i++)
79 <    for (j=0; j<3; j++) tempMat[i][j] = 0.0;;
78 >    if (i != molecules_.end() ) {
79 >        molecules_.push_back(mol);
80 >        nAtoms_ -= mol->getNAtoms();
81 >        nBonds_ -= mol->getNBonds();
82 >        nBends_ -= mol->getNBends();
83 >        nTorsions_ -= mol->getNTorsions();
84 >        nRigidBodies_ -= mol->getNRigidBodies();
85 >        nIntegrableObjects_ -= mol->getNIntegrableObjects();
86 >        nCutoffGroups_ -= mol->getNCutoffGroups();
87 >        nConstraints_ -= mol->getNConstraints();
88  
89 <  tempMat[0][0] = newBox[0];
90 <  tempMat[1][1] = newBox[1];
91 <  tempMat[2][2] = newBox[2];
92 <
106 <  setBoxM( tempMat );
107 <
108 < }
109 <
110 < void SimInfo::setBoxM( double theBox[3][3] ){
111 <  
112 <  int i, j;
113 <  double FortranHmat[9]; // to preserve compatibility with Fortran the
114 <                         // ordering in the array is as follows:
115 <                         // [ 0 3 6 ]
116 <                         // [ 1 4 7 ]
117 <                         // [ 2 5 8 ]
118 <  double FortranHmatInv[9]; // the inverted Hmat (for Fortran);
119 <
120 <  if( !boxIsInit ) boxIsInit = 1;
121 <
122 <  for(i=0; i < 3; i++)
123 <    for (j=0; j < 3; j++) Hmat[i][j] = theBox[i][j];
124 <  
125 <  calcBoxL();
126 <  calcHmatInv();
127 <
128 <  for(i=0; i < 3; i++) {
129 <    for (j=0; j < 3; j++) {
130 <      FortranHmat[3*j + i] = Hmat[i][j];
131 <      FortranHmatInv[3*j + i] = HmatInv[i][j];
89 >        globalIndexToMol_.erase(mol->getGlobalIndex());
90 >        return true;
91 >    } else {
92 >        return false;
93      }
133  }
94  
135  setFortranBoxSize(FortranHmat, FortranHmatInv, &orthoRhombic);
136
137 }
138
95  
96 < void SimInfo::getBoxM (double theBox[3][3]) {
96 > }    
97  
98 <  int i, j;
99 <  for(i=0; i<3; i++)
100 <    for (j=0; j<3; j++) theBox[i][j] = Hmat[i][j];
101 < }
98 >        
99 > Molecule* SimInfo::beginMolecule(std::vector<Molecule*>::iterator& i) {
100 >    i = molecules_.begin();
101 >    return i == molecules_.end() ? NULL : *i;
102 > }    
103  
104 <
105 < void SimInfo::scaleBox(double scale) {
106 <  double theBox[3][3];
150 <  int i, j;
151 <
152 <  // cerr << "Scaling box by " << scale << "\n";
153 <
154 <  for(i=0; i<3; i++)
155 <    for (j=0; j<3; j++) theBox[i][j] = Hmat[i][j]*scale;
156 <
157 <  setBoxM(theBox);
158 <
104 > Molecule* SimInfo::nextMolecule(std::vector<Molecule*>::iterator& i) {
105 >    ++i;
106 >    return i == molecules_.end() ? NULL : *i;    
107   }
108  
161 void SimInfo::calcHmatInv( void ) {
162  
163  int oldOrtho;
164  int i,j;
165  double smallDiag;
166  double tol;
167  double sanity[3][3];
109  
110 <  invertMat3( Hmat, HmatInv );
110 > void SimInfo::calcNdf() {
111 >    int ndf_local;
112 >    std::vector<Molecule*>::iterator i;
113 >    std::vector<StuntDouble*>::iterator j;
114 >    Molecule* mol;
115 >    StuntDouble* integrableObject;
116  
117 <  // check to see if Hmat is orthorhombic
172 <  
173 <  oldOrtho = orthoRhombic;
174 <
175 <  smallDiag = fabs(Hmat[0][0]);
176 <  if(smallDiag > fabs(Hmat[1][1])) smallDiag = fabs(Hmat[1][1]);
177 <  if(smallDiag > fabs(Hmat[2][2])) smallDiag = fabs(Hmat[2][2]);
178 <  tol = smallDiag * orthoTolerance;
179 <
180 <  orthoRhombic = 1;
181 <  
182 <  for (i = 0; i < 3; i++ ) {
183 <    for (j = 0 ; j < 3; j++) {
184 <      if (i != j) {
185 <        if (orthoRhombic) {
186 <          if ( fabs(Hmat[i][j]) >= tol) orthoRhombic = 0;
187 <        }        
188 <      }
189 <    }
190 <  }
191 <
192 <  if( oldOrtho != orthoRhombic ){
117 >    ndf_local = 0;
118      
119 <    if( orthoRhombic ) {
120 <      sprintf( painCave.errMsg,
121 <               "OOPSE is switching from the default Non-Orthorhombic\n"
197 <               "\tto the faster Orthorhombic periodic boundary computations.\n"
198 <               "\tThis is usually a good thing, but if you wan't the\n"
199 <               "\tNon-Orthorhombic computations, make the orthoBoxTolerance\n"
200 <               "\tvariable ( currently set to %G ) smaller.\n",
201 <               orthoTolerance);
202 <      painCave.severity = OOPSE_INFO;
203 <      simError();
204 <    }
205 <    else {
206 <      sprintf( painCave.errMsg,
207 <               "OOPSE is switching from the faster Orthorhombic to the more\n"
208 <               "\tflexible Non-Orthorhombic periodic boundary computations.\n"
209 <               "\tThis is usually because the box has deformed under\n"
210 <               "\tNPTf integration. If you wan't to live on the edge with\n"
211 <               "\tthe Orthorhombic computations, make the orthoBoxTolerance\n"
212 <               "\tvariable ( currently set to %G ) larger.\n",
213 <               orthoTolerance);
214 <      painCave.severity = OOPSE_WARNING;
215 <      simError();
216 <    }
217 <  }
218 < }
119 >    for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
120 >        for (integrableObject = mol->beginIntegrableObject(j); integrableObject != NULL;
121 >               integrableObject = mol->nextIntegrableObject(j)) {
122  
123 < void SimInfo::calcBoxL( void ){
123 >            ndf_local += 3;
124  
125 <  double dx, dy, dz, dsq;
126 <
127 <  // boxVol = Determinant of Hmat
128 <
129 <  boxVol = matDet3( Hmat );
130 <
131 <  // boxLx
132 <  
133 <  dx = Hmat[0][0]; dy = Hmat[1][0]; dz = Hmat[2][0];
134 <  dsq = dx*dx + dy*dy + dz*dz;
232 <  boxL[0] = sqrt( dsq );
233 <  //maxCutoff = 0.5 * boxL[0];
234 <
235 <  // boxLy
236 <  
237 <  dx = Hmat[0][1]; dy = Hmat[1][1]; dz = Hmat[2][1];
238 <  dsq = dx*dx + dy*dy + dz*dz;
239 <  boxL[1] = sqrt( dsq );
240 <  //if( (0.5 * boxL[1]) < maxCutoff ) maxCutoff = 0.5 * boxL[1];
241 <
242 <
243 <  // boxLz
244 <  
245 <  dx = Hmat[0][2]; dy = Hmat[1][2]; dz = Hmat[2][2];
246 <  dsq = dx*dx + dy*dy + dz*dz;
247 <  boxL[2] = sqrt( dsq );
248 <  //if( (0.5 * boxL[2]) < maxCutoff ) maxCutoff = 0.5 * boxL[2];
249 <
250 <  //calculate the max cutoff
251 <  maxCutoff =  calcMaxCutOff();
252 <  
253 <  checkCutOffs();
254 <
255 < }
256 <
257 <
258 < double SimInfo::calcMaxCutOff(){
259 <
260 <  double ri[3], rj[3], rk[3];
261 <  double rij[3], rjk[3], rki[3];
262 <  double minDist;
263 <
264 <  ri[0] = Hmat[0][0];
265 <  ri[1] = Hmat[1][0];
266 <  ri[2] = Hmat[2][0];
267 <
268 <  rj[0] = Hmat[0][1];
269 <  rj[1] = Hmat[1][1];
270 <  rj[2] = Hmat[2][1];
271 <
272 <  rk[0] = Hmat[0][2];
273 <  rk[1] = Hmat[1][2];
274 <  rk[2] = Hmat[2][2];
125 >            if (integrableObject->isDirectional()) {
126 >                if (integrableObject->isLinear()) {
127 >                    ndf_local += 2;
128 >                } else {
129 >                    ndf_local += 3;
130 >                }
131 >            }
132 >            
133 >        }//end for (integrableObject)
134 >    }// end for (mol)
135      
136 <  crossProduct3(ri, rj, rij);
137 <  distXY = dotProduct3(rk,rij) / norm3(rij);
136 >    // n_constraints is local, so subtract them on each processor
137 >    ndf_local -= nConstraints_;
138  
139 <  crossProduct3(rj,rk, rjk);
140 <  distYZ = dotProduct3(ri,rjk) / norm3(rjk);
139 > #ifdef IS_MPI
140 >    MPI_Allreduce(&ndf_local,&ndf_,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
141 > #else
142 >    ndf_ = ndf_local;
143 > #endif
144  
145 <  crossProduct3(rk,ri, rki);
146 <  distZX = dotProduct3(rj,rki) / norm3(rki);
145 >    // nZconstraints is global, as are the 3 COM translations for the
146 >    // entire system:
147 >    ndf_ = ndf_ - 3 - nZconstraints;
148  
285  minDist = min(min(distXY, distYZ), distZX);
286  return minDist/2;
287  
149   }
150  
151 < void SimInfo::wrapVector( double thePos[3] ){
151 > void SimInfo::calcNdfRaw() {
152 >    int ndfRaw_local;
153  
154 <  int i;
155 <  double scaled[3];
154 >    std::vector<Molecule*>::iterator i;
155 >    std::vector<StuntDouble*>::iterator j;
156 >    Molecule* mol;
157 >    StuntDouble* integrableObject;
158  
159 <  if( !orthoRhombic ){
160 <    // calc the scaled coordinates.
297 <  
298 <
299 <    matVecMul3(HmatInv, thePos, scaled);
159 >    // Raw degrees of freedom that we have to set
160 >    ndfRaw_local = 0;
161      
162 <    for(i=0; i<3; i++)
163 <      scaled[i] -= roundMe(scaled[i]);
164 <    
304 <    // calc the wrapped real coordinates from the wrapped scaled coordinates
305 <    
306 <    matVecMul3(Hmat, scaled, thePos);
162 >    for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
163 >        for (integrableObject = mol->beginIntegrableObject(j); integrableObject != NULL;
164 >               integrableObject = mol->nextIntegrableObject(j)) {
165  
166 <  }
309 <  else{
310 <    // calc the scaled coordinates.
311 <    
312 <    for(i=0; i<3; i++)
313 <      scaled[i] = thePos[i]*HmatInv[i][i];
314 <    
315 <    // wrap the scaled coordinates
316 <    
317 <    for(i=0; i<3; i++)
318 <      scaled[i] -= roundMe(scaled[i]);
319 <    
320 <    // calc the wrapped real coordinates from the wrapped scaled coordinates
321 <    
322 <    for(i=0; i<3; i++)
323 <      thePos[i] = scaled[i]*Hmat[i][i];
324 <  }
325 <    
326 < }
166 >            ndfRaw_local += 3;
167  
168 <
169 < int SimInfo::getNDF(){
170 <  int ndf_local;
171 <
172 <  ndf_local = 0;
173 <  
174 <  for(int i = 0; i < integrableObjects.size(); i++){
175 <    ndf_local += 3;
176 <    if (integrableObjects[i]->isDirectional()) {
337 <      if (integrableObjects[i]->isLinear())
338 <        ndf_local += 2;
339 <      else
340 <        ndf_local += 3;
168 >            if (integrableObject->isDirectional()) {
169 >                if (integrableObject->isLinear()) {
170 >                    ndfRaw_local += 2;
171 >                } else {
172 >                    ndfRaw_local += 3;
173 >                }
174 >            }
175 >            
176 >        }
177      }
342  }
343
344  // n_constraints is local, so subtract them on each processor:
345
346  ndf_local -= n_constraints;
347
348 #ifdef IS_MPI
349  MPI_Allreduce(&ndf_local,&ndf,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
350 #else
351  ndf = ndf_local;
352 #endif
353
354  // nZconstraints is global, as are the 3 COM translations for the
355  // entire system:
356
357  ndf = ndf - 3 - nZconstraints;
358
359  return ndf;
360 }
361
362 int SimInfo::getNDFraw() {
363  int ndfRaw_local;
364
365  // Raw degrees of freedom that we have to set
366  ndfRaw_local = 0;
367
368  for(int i = 0; i < integrableObjects.size(); i++){
369    ndfRaw_local += 3;
370    if (integrableObjects[i]->isDirectional()) {
371       if (integrableObjects[i]->isLinear())
372        ndfRaw_local += 2;
373      else
374        ndfRaw_local += 3;
375    }
376  }
178      
179   #ifdef IS_MPI
180 <  MPI_Allreduce(&ndfRaw_local,&ndfRaw,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
180 >    MPI_Allreduce(&ndfRaw_local,&ndfRaw_,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
181   #else
182 <  ndfRaw = ndfRaw_local;
182 >    ndfRaw_ = ndfRaw_local;
183   #endif
383
384  return ndfRaw;
184   }
185  
186 < int SimInfo::getNDFtranslational() {
187 <  int ndfTrans_local;
186 > void SimInfo::calcNdfTrans() {
187 >    int ndfTrans_local;
188  
189 <  ndfTrans_local = 3 * integrableObjects.size() - n_constraints;
189 >    ndfTrans_local = 3 * nIntegrableObjects_ - nConstraints_;
190  
191  
192   #ifdef IS_MPI
193 <  MPI_Allreduce(&ndfTrans_local,&ndfTrans,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
193 >    MPI_Allreduce(&ndfTrans_local,&ndfTrans_,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
194   #else
195 <  ndfTrans = ndfTrans_local;
195 >    ndfTrans_ = ndfTrans_local;
196   #endif
197  
198 <  ndfTrans = ndfTrans - 3 - nZconstraints;
199 <
401 <  return ndfTrans;
198 >    ndfTrans_ = ndfTrans_ - 3 - nZconstraints;
199 >
200   }
201  
202 < int SimInfo::getTotIntegrableObjects() {
203 <  int nObjs_local;
204 <  int nObjs;
202 > void SimInfo::addExcludePairs(Molecule* mol) {
203 >    std::vector<Bond*>::iterator bondIter;
204 >    std::vector<Bend*>::iterator bendIter;
205 >    std::vector<Torsion*>::iterator torsionIter;
206 >    Bond* bond;
207 >    Bend* bend;
208 >    Torsion* torsion;
209 >    int a;
210 >    int b;
211 >    int c;
212 >    int d;
213 >    
214 >    for (bond= mol->beginBond(bondIter); bond != NULL; bond = mol->nextBond(bondIter)) {
215 >        a = bond->getAtomA()->getGlobalIndex();
216 >        b = bond->getAtomB()->getGlobalIndex();        
217 >        exclude_.addPair(a, b);
218 >    }
219  
220 <  nObjs_local =  integrableObjects.size();
220 >    for (bend= mol->beginBend(bendIter); bend != NULL; bend = mol->nextBend(bendIter)) {
221 >        a = bend->getAtomA()->getGlobalIndex();
222 >        b = bend->getAtomB()->getGlobalIndex();        
223 >        c = bend->getAtomC()->getGlobalIndex();
224  
225 +        exclude_.addPair(a, b);
226 +        exclude_.addPair(a, c);
227 +        exclude_.addPair(b, c);        
228 +    }
229  
230 < #ifdef IS_MPI
231 <  MPI_Allreduce(&nObjs_local,&nObjs,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
232 < #else
233 <  nObjs = nObjs_local;
234 < #endif
230 >    for (torsion= mol->beginTorsion(torsionIter); torsion != NULL; torsion = mol->nextBond(torsionIter)) {
231 >        a = torsion->getAtomA()->getGlobalIndex();
232 >        b = torsion->getAtomB()->getGlobalIndex();        
233 >        c = torsion->getAtomC()->getGlobalIndex();        
234 >        d = torsion->getAtomD()->getGlobalIndex();        
235  
236 +        exclude_.addPair(a, b);
237 +        exclude_.addPair(a, c);
238 +        exclude_.addPair(a, d);
239 +        exclude_.addPair(b, c);
240 +        exclude_.addPair(b, d);
241 +        exclude_.addPair(c, d);        
242 +    }
243  
244 <  return nObjs;
244 >    
245   }
246  
247 < void SimInfo::refreshSim(){
248 <
249 <  simtype fInfo;
250 <  int isError;
251 <  int n_global;
252 <  int* excl;
253 <
254 <  fInfo.dielect = 0.0;
255 <
256 <  if( useDipoles ){
257 <    if( useReactionField )fInfo.dielect = dielectric;
432 <  }
433 <
434 <  fInfo.SIM_uses_PBC = usePBC;
435 <  //fInfo.SIM_uses_LJ = 0;
436 <  fInfo.SIM_uses_LJ = useLJ;
437 <  fInfo.SIM_uses_sticky = useSticky;
438 <  //fInfo.SIM_uses_sticky = 0;
439 <  fInfo.SIM_uses_charges = useCharges;
440 <  fInfo.SIM_uses_dipoles = useDipoles;
441 <  //fInfo.SIM_uses_dipoles = 0;
442 <  fInfo.SIM_uses_RF = useReactionField;
443 <  //fInfo.SIM_uses_RF = 0;
444 <  fInfo.SIM_uses_GB = useGB;
445 <  fInfo.SIM_uses_EAM = useEAM;
446 <
447 <  n_exclude = excludes->getSize();
448 <  excl = excludes->getFortranArray();
449 <  
450 < #ifdef IS_MPI
451 <  n_global = mpiSim->getNAtomsGlobal();
452 < #else
453 <  n_global = n_atoms;
454 < #endif
455 <  
456 <  isError = 0;
457 <  
458 <  getFortranGroupArrays(this, FglobalGroupMembership, mfact);
459 <  //it may not be a good idea to pass the address of first element in vector
460 <  //since c++ standard does not require vector to be stored continuously in meomory
461 <  //Most of the compilers will organize the memory of vector continuously
462 <  setFsimulation( &fInfo, &n_global, &n_atoms, identArray, &n_exclude, excl,
463 <                  &nGlobalExcludes, globalExcludes, molMembershipArray,
464 <                  &mfact[0], &ngroup, &FglobalGroupMembership[0], &isError);
465 <
466 <  if( isError ){
247 > void SimInfo::removeExcludePairs(Molecule* mol) {
248 >    std::vector<Bond*>::iterator bondIter;
249 >    std::vector<Bend*>::iterator bendIter;
250 >    std::vector<Torsion*>::iterator torsionIter;
251 >    Bond* bond;
252 >    Bend* bend;
253 >    Torsion* torsion;
254 >    int a;
255 >    int b;
256 >    int c;
257 >    int d;
258      
259 <    sprintf( painCave.errMsg,
260 <             "There was an error setting the simulation information in fortran.\n" );
261 <    painCave.isFatal = 1;
262 <    painCave.severity = OOPSE_ERROR;
263 <    simError();
473 <  }
474 <  
475 < #ifdef IS_MPI
476 <  sprintf( checkPointMsg,
477 <           "succesfully sent the simulation information to fortran.\n");
478 <  MPIcheckPoint();
479 < #endif // is_mpi
480 <  
481 <  this->ndf = this->getNDF();
482 <  this->ndfRaw = this->getNDFraw();
483 <  this->ndfTrans = this->getNDFtranslational();
484 < }
259 >    for (bond= mol->beginBond(bondIter); bond != NULL; bond = mol->nextBond(bondIter)) {
260 >        a = bond->getAtomA()->getGlobalIndex();
261 >        b = bond->getAtomB()->getGlobalIndex();        
262 >        exclude_.removePair(a, b);
263 >    }
264  
265 < void SimInfo::setDefaultRcut( double theRcut ){
266 <  
267 <  haveRcut = 1;
268 <  rCut = theRcut;
490 <  rList = rCut + 1.0;
491 <  
492 <  notifyFortranCutOffs( &rCut, &rSw, &rList );
493 < }
265 >    for (bend= mol->beginBend(bendIter); bend != NULL; bend = mol->nextBend(bendIter)) {
266 >        a = bend->getAtomA()->getGlobalIndex();
267 >        b = bend->getAtomB()->getGlobalIndex();        
268 >        c = bend->getAtomC()->getGlobalIndex();
269  
270 < void SimInfo::setDefaultRcut( double theRcut, double theRsw ){
270 >        exclude_.removePair(a, b);
271 >        exclude_.removePair(a, c);
272 >        exclude_.removePair(b, c);        
273 >    }
274  
275 <  rSw = theRsw;
276 <  setDefaultRcut( theRcut );
277 < }
275 >    for (torsion= mol->beginTorsion(torsionIter); torsion != NULL; torsion = mol->nextBond(torsionIter)) {
276 >        a = torsion->getAtomA()->getGlobalIndex();
277 >        b = torsion->getAtomB()->getGlobalIndex();        
278 >        c = torsion->getAtomC()->getGlobalIndex();        
279 >        d = torsion->getAtomD()->getGlobalIndex();        
280  
281 +        exclude_.removePair(a, b);
282 +        exclude_.removePair(a, c);
283 +        exclude_.removePair(a, d);
284 +        exclude_.removePair(b, c);
285 +        exclude_.removePair(b, d);
286 +        exclude_.removePair(c, d);        
287 +    }
288  
502 void SimInfo::checkCutOffs( void ){
503  
504  if( boxIsInit ){
505    
506    //we need to check cutOffs against the box
507    
508    if( rCut > maxCutoff ){
509      sprintf( painCave.errMsg,
510               "cutoffRadius is too large for the current periodic box.\n"
511               "\tCurrent Value of cutoffRadius = %G at time %G\n "
512               "\tThis is larger than half of at least one of the\n"
513               "\tperiodic box vectors.  Right now, the Box matrix is:\n"
514               "\n"
515               "\t[ %G %G %G ]\n"
516               "\t[ %G %G %G ]\n"
517               "\t[ %G %G %G ]\n",
518               rCut, currentTime,
519               Hmat[0][0], Hmat[0][1], Hmat[0][2],
520               Hmat[1][0], Hmat[1][1], Hmat[1][2],
521               Hmat[2][0], Hmat[2][1], Hmat[2][2]);
522      painCave.severity = OOPSE_ERROR;
523      painCave.isFatal = 1;
524      simError();
525    }    
526  } else {
527    // initialize this stuff before using it, OK?
528    sprintf( painCave.errMsg,
529             "Trying to check cutoffs without a box.\n"
530             "\tOOPSE should have better programmers than that.\n" );
531    painCave.severity = OOPSE_ERROR;
532    painCave.isFatal = 1;
533    simError();      
534  }
535  
289   }
290  
538 void SimInfo::addProperty(GenericData* prop){
291  
292 <  map<string, GenericData*>::iterator result;
293 <  result = properties.find(prop->getID());
542 <  
543 <  //we can't simply use  properties[prop->getID()] = prop,
544 <  //it will cause memory leak if we already contain a propery which has the same name of prop
545 <  
546 <  if(result != properties.end()){
547 <    
548 <    delete (*result).second;
549 <    (*result).second = prop;
550 <      
551 <  }
552 <  else{
292 > void SimInfo::addMoleculeStamp(MoleculeStamp* molStamp, int nmol) {
293 >    int curStampId;
294  
295 <    properties[prop->getID()] = prop;
295 >    //index from 0
296 >    curStampId = molStampIds_.size();
297  
298 <  }
299 <    
298 >    moleculeStamps_.push_back(molStamp);
299 >    molStampIds_.insert(molStampIds_.end(), nmol, curStampId)
300   }
301  
302 < GenericData* SimInfo::getProperty(const string& propName){
561 <
562 <  map<string, GenericData*>::iterator result;
563 <  
564 <  //string lowerCaseName = ();
565 <  
566 <  result = properties.find(propName);
567 <  
568 <  if(result != properties.end())
569 <    return (*result).second;  
570 <  else  
571 <    return NULL;  
572 < }
302 > std::ostream& operator <<(ostream& o, SimInfo& info) {
303  
304 <
575 < void SimInfo::getFortranGroupArrays(SimInfo* info,
576 <                                    vector<int>& FglobalGroupMembership,
577 <                                    vector<double>& mfact){
578 <  
579 <  Molecule* myMols;
580 <  Atom** myAtoms;
581 <  int numAtom;
582 <  double mtot;
583 <  int numMol;
584 <  int numCutoffGroups;
585 <  CutoffGroup* myCutoffGroup;
586 <  vector<CutoffGroup*>::iterator iterCutoff;
587 <  Atom* cutoffAtom;
588 <  vector<Atom*>::iterator iterAtom;
589 <  int atomIndex;
590 <  double totalMass;
591 <  
592 <  mfact.clear();
593 <  FglobalGroupMembership.clear();
594 <  
595 <
596 <  // Fix the silly fortran indexing problem
597 < #ifdef IS_MPI
598 <  numAtom = mpiSim->getNAtomsGlobal();
599 < #else
600 <  numAtom = n_atoms;
601 < #endif
602 <  for (int i = 0; i < numAtom; i++)
603 <    FglobalGroupMembership.push_back(globalGroupMembership[i] + 1);
604 <  
605 <
606 <  myMols = info->molecules;
607 <  numMol = info->n_mol;
608 <  for(int i  = 0; i < numMol; i++){
609 <    numCutoffGroups = myMols[i].getNCutoffGroups();
610 <    for(myCutoffGroup =myMols[i].beginCutoffGroup(iterCutoff);
611 <        myCutoffGroup != NULL;
612 <        myCutoffGroup =myMols[i].nextCutoffGroup(iterCutoff)){
613 <
614 <      totalMass = myCutoffGroup->getMass();
615 <      
616 <      for(cutoffAtom = myCutoffGroup->beginAtom(iterAtom);
617 <          cutoffAtom != NULL;
618 <          cutoffAtom = myCutoffGroup->nextAtom(iterAtom)){
619 <        mfact.push_back(cutoffAtom->getMass()/totalMass);
620 <      }  
621 <    }
622 <  }
623 <
304 >    return o;
305   }
306 +
307 + }//end namespace oopse

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines