ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/brains/SimInfo.cpp
(Generate patch)

Comparing trunk/src/brains/SimInfo.cpp (file contents):
Revision 963 by tim, Wed May 17 21:51:42 2006 UTC vs.
Revision 1045 by chrisfen, Thu Sep 21 18:25:17 2006 UTC

# Line 53 | Line 53
53   #include "brains/SimInfo.hpp"
54   #include "math/Vector3.hpp"
55   #include "primitives/Molecule.hpp"
56 + #include "primitives/StuntDouble.hpp"
57   #include "UseTheForce/fCutoffPolicy.h"
58   #include "UseTheForce/DarkSide/fElectrostaticSummationMethod.h"
59   #include "UseTheForce/DarkSide/fElectrostaticScreeningMethod.h"
# Line 89 | Line 90 | namespace oopse {
90      nGlobalIntegrableObjects_(0), nGlobalRigidBodies_(0),
91      nAtoms_(0), nBonds_(0),  nBends_(0), nTorsions_(0), nRigidBodies_(0),
92      nIntegrableObjects_(0),  nCutoffGroups_(0), nConstraints_(0),
93 <    sman_(NULL), fortranInitialized_(false) {
93 >    sman_(NULL), fortranInitialized_(false), calcBoxDipole_(false) {
94  
95        MoleculeStamp* molStamp;
96        int nMolWithSameStamp;
# Line 600 | Line 601 | namespace oopse {
601      /** @deprecate */    
602      int isError = 0;
603      
604 +    setupCutoff();
605 +    
606      setupElectrostaticSummationMethod( isError );
607      setupSwitchingFunction();
608 +    setupAccumulateBoxDipole();
609  
610      if(isError){
611        sprintf( painCave.errMsg,
# Line 609 | Line 613 | namespace oopse {
613        painCave.isFatal = 1;
614        simError();
615      }
612 –  
613 –    
614 –    setupCutoff();
616  
617      calcNdf();
618      calcNdfRaw();
# Line 661 | Line 662 | namespace oopse {
662      int usePBC = simParams_->getUsePeriodicBoundaryConditions();
663      int useRF;
664      int useSF;
665 +    int useSP;
666 +    int useBoxDipole;
667      std::string myMethod;
668  
669      // set the useRF logical
# Line 671 | Line 674 | namespace oopse {
674      if (simParams_->haveElectrostaticSummationMethod()) {
675        std::string myMethod = simParams_->getElectrostaticSummationMethod();
676        toUpper(myMethod);
677 <      if (myMethod == "REACTION_FIELD") {
677 >      if (myMethod == "REACTION_FIELD"){
678          useRF=1;
679 <      } else {
680 <        if (myMethod == "SHIFTED_FORCE") {
681 <          useSF = 1;
682 <        }
679 >      } else if (myMethod == "SHIFTED_FORCE"){
680 >        useSF = 1;
681 >      } else if (myMethod == "SHIFTED_POTENTIAL"){
682 >        useSP = 1;
683        }
684      }
685 +    
686 +    if (simParams_->haveAccumulateBoxDipole())
687 +      if (simParams_->getAccumulateBoxDipole())
688 +        useBoxDipole = 1;
689  
690      //loop over all of the atom types
691      for (i = atomTypes.begin(); i != atomTypes.end(); ++i) {
# Line 749 | Line 756 | namespace oopse {
756      MPI_Allreduce(&temp, &useRF, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
757  
758      temp = useSF;
759 <    MPI_Allreduce(&temp, &useSF, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
759 >    MPI_Allreduce(&temp, &useSF, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);  
760  
761 +    temp = useSP;
762 +    MPI_Allreduce(&temp, &useSP, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
763 +
764 +    temp = useBoxDipole;
765 +    MPI_Allreduce(&temp, &useBoxDipole, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
766 +
767   #endif
768  
769      fInfo_.SIM_uses_PBC = usePBC;    
# Line 768 | Line 781 | namespace oopse {
781      fInfo_.SIM_uses_FLARB = useFLARB;
782      fInfo_.SIM_uses_RF = useRF;
783      fInfo_.SIM_uses_SF = useSF;
784 +    fInfo_.SIM_uses_SP = useSP;
785 +    fInfo_.SIM_uses_BoxDipole = useBoxDipole;
786  
787      if( myMethod == "REACTION_FIELD") {
788        
# Line 1058 | Line 1073 | namespace oopse {
1073      int sm = UNDAMPED;
1074      RealType alphaVal;
1075      RealType dielectric;
1076 <
1076 >    
1077      errorOut = isError;
1063 –    alphaVal = simParams_->getDampingAlpha();
1078      dielectric = simParams_->getDielectric();
1079  
1080      if (simParams_->haveElectrostaticSummationMethod()) {
# Line 1106 | Line 1120 | namespace oopse {
1120          if (myScreen == "DAMPED") {
1121            sm = DAMPED;
1122            if (!simParams_->haveDampingAlpha()) {
1123 <            //throw error
1123 >            // first set a cutoff dependent alpha value
1124 >            // we assume alpha depends linearly with rcut from 0 to 20.5 ang
1125 >            alphaVal = 0.5125 - rcut_* 0.025;
1126 >            // for values rcut > 20.5, alpha is zero
1127 >            if (alphaVal < 0) alphaVal = 0;
1128 >
1129 >            // throw warning
1130              sprintf( painCave.errMsg,
1131                       "SimInfo warning: dampingAlpha was not specified in the input file.\n"
1132 <                     "\tA default value of %f (1/ang) will be used.\n", alphaVal);
1132 >                     "\tA default value of %f (1/ang) will be used for the cutoff of\n\t%f (ang).\n", alphaVal, rcut_);
1133              painCave.isFatal = 0;
1134              simError();
1135            }
# Line 1161 | Line 1181 | namespace oopse {
1181  
1182    }
1183  
1184 +  void SimInfo::setupAccumulateBoxDipole() {    
1185 +
1186 +    // we only call setAccumulateBoxDipole if the accumulateBoxDipole parameter is true
1187 +    if ( simParams_->haveAccumulateBoxDipole() )
1188 +      if ( simParams_->getAccumulateBoxDipole() ) {
1189 +        setAccumulateBoxDipole();
1190 +        calcBoxDipole_ = true;
1191 +      }
1192 +
1193 +  }
1194 +
1195    void SimInfo::addProperty(GenericData* genData) {
1196      properties_.addProperty(genData);  
1197    }
# Line 1410 | Line 1441 | namespace oopse {
1441        return angularMomentum;
1442     }
1443    
1444 <  
1444 >  StuntDouble* SimInfo::getIOIndexToIntegrableObject(int index) {
1445 >    return IOIndexToIntegrableObject.at(index);
1446 >  }
1447 >  
1448 >  void SimInfo::setIOIndexToIntegrableObject(const std::vector<StuntDouble*>& v) {
1449 >    IOIndexToIntegrableObject= v;
1450 >  }
1451 >
1452 > /*
1453 >   void SimInfo::setStuntDoubleFromGlobalIndex(std::vector<StuntDouble*> v) {
1454 >      assert( v.size() == nAtoms_ + nRigidBodies_);
1455 >      sdByGlobalIndex_ = v;
1456 >    }
1457 >
1458 >    StuntDouble* SimInfo::getStuntDoubleFromGlobalIndex(int index) {
1459 >      //assert(index < nAtoms_ + nRigidBodies_);
1460 >      return sdByGlobalIndex_.at(index);
1461 >    }  
1462 > */  
1463   }//end namespace oopse
1464  

Diff Legend

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