ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/restraints/ThermoIntegrationForceManager.cpp
(Generate patch)

Comparing trunk/src/restraints/ThermoIntegrationForceManager.cpp (file contents):
Revision 665 by tim, Thu Oct 13 22:26:47 2005 UTC vs.
Revision 1360 by cli2, Mon Sep 7 16:31:51 2009 UTC

# Line 39 | Line 39
39   * such damages.
40   */
41  
42 < #include <cmath>
42 >
43   #include "restraints/ThermoIntegrationForceManager.hpp"
44 – #include "integrators/Integrator.hpp"
45 – #include "math/SquareMatrix3.hpp"
46 – #include "primitives/Molecule.hpp"
47 – #include "utils/simError.h"
48 – #include "utils/OOPSEConstant.hpp"
49 – #include "utils/StringUtils.hpp"
44  
45 + #ifdef IS_MPI
46 + #include <mpi.h>
47 + #endif
48 +
49   namespace oopse {
50    
51    ThermoIntegrationForceManager::ThermoIntegrationForceManager(SimInfo* info):
52 <    ForceManager(info){
53 <      currSnapshot_ = info_->getSnapshotManager()->getCurrentSnapshot();
54 <      simParam = info_->getSimParams();
52 >    RestraintForceManager(info){
53 >    currSnapshot_ = info_->getSnapshotManager()->getCurrentSnapshot();
54 >    simParam = info_->getSimParams();
55      
56 <      if (simParam->haveThermodynamicIntegrationLambda()){
57 <        tIntLambda_ = simParam->getThermodynamicIntegrationLambda();
58 <      }
59 <      else{
60 <        tIntLambda_ = 1.0;
61 <        sprintf(painCave.errMsg,
62 <                "ThermoIntegration error: the transformation parameter (lambda) was\n"
63 <                "\tnot specified. OOPSE will use a default value of %f. To set\n"
64 <                "\tlambda, use the thermodynamicIntegrationLambda variable.\n",
65 <                tIntLambda_);
66 <        painCave.isFatal = 0;
67 <        simError();
68 <      }
56 >    if (simParam->haveThermodynamicIntegrationLambda()){
57 >      tIntLambda_ = simParam->getThermodynamicIntegrationLambda();
58 >    }
59 >    else{
60 >      tIntLambda_ = 1.0;
61 >      sprintf(painCave.errMsg,
62 >              "ThermoIntegration error: the transformation parameter\n"
63 >              "\t(lambda) was not specified. OOPSE will use a default\n"
64 >              "\tvalue of %f. To set lambda, use the \n"
65 >              "\tthermodynamicIntegrationLambda variable.\n",
66 >              tIntLambda_);
67 >      painCave.isFatal = 0;
68 >      simError();
69 >    }
70      
71 <      if (simParam->haveThermodynamicIntegrationK()){
72 <        tIntK_ = simParam->getThermodynamicIntegrationK();
74 <      }
75 <      else{
76 <        tIntK_ = 1.0;
77 <        sprintf(painCave.errMsg,
78 <                "ThermoIntegration Warning: the tranformation parameter exponent\n"
79 <                "\t(k) was not specified. OOPSE will use a default value of %f.\n"
80 <                "\tTo set k, use the thermodynamicIntegrationK variable.\n",
81 <                tIntK_);
82 <        painCave.isFatal = 0;
83 <        simError();      
84 <      }
85 <    
86 <      if (simParam->getUseSolidThermInt()) {
87 <        // build a restraint object
88 <        restraint_ =  new Restraints(info_, tIntLambda_, tIntK_);
89 <      
90 <      }
91 <    
92 <      // build the scaling factor used to modulate the forces and torques
93 <      factor_ = pow(tIntLambda_, tIntK_);
94 <
71 >    if (simParam->haveThermodynamicIntegrationK()){
72 >      tIntK_ = simParam->getThermodynamicIntegrationK();
73      }
74 +    else{
75 +      tIntK_ = 1.0;
76 +      sprintf(painCave.errMsg,
77 +              "ThermoIntegration Warning: the tranformation parameter\n"
78 +              "\texponent (k) was not specified. OOPSE will use a default\n"
79 +              "\tvalue of %f. To set k, use the thermodynamicIntegrationK\n"
80 +              "\tvariable.\n",
81 +              tIntK_);
82 +      painCave.isFatal = 0;
83 +      simError();      
84 +    }
85 +    
86 +    // build the scaling factor used to modulate the forces and torques
87 +    factor_ = pow(tIntLambda_, tIntK_);
88 +  }
89    
90    ThermoIntegrationForceManager::~ThermoIntegrationForceManager(){
91    }
# Line 131 | Line 124 | namespace oopse {
124          }
125        }
126      }
127 <  
127 >    
128      // set vraw to be the unmodulated potential
129      lrPot_ = curSnapshot->statData[Stats::LONG_RANGE_POTENTIAL];
130      curSnapshot->statData[Stats::VRAW] = lrPot_;
# Line 145 | Line 138 | namespace oopse {
138      tempTau *= factor_;
139      curSnapshot->statData.setTau(tempTau);
140  
141 <    // do crystal restraint forces for thermodynamic integration
142 <    if (simParam->getUseSolidThermInt()) {
143 <      
151 <      lrPot_ += restraint_->Calc_Restraint_Forces();
152 <      curSnapshot->statData[Stats::LONG_RANGE_POTENTIAL] = lrPot_;
153 <      
154 <      vHarm_ = restraint_->getVharm();
155 <      curSnapshot->statData[Stats::VHARM] = vHarm_;
156 <    }
141 >    // now, on to the applied restraining potentials (if needed):
142 >    RealType restPot_local = 0.0;
143 >    RealType vHarm_local = 0.0;
144      
145 <  }
146 <  
145 >    if (simParam->getUseRestraints()) {
146 >      // do restraints from RestraintForceManager:
147 >      //restPot_local = doRestraints(1.0 - factor_);    
148 >      restPot_local = doRestraints(1.0 - factor_);      
149 >      vHarm_local = getUnscaledPotential();
150 >    }
151 >      
152 > #ifdef IS_MPI
153 >    RealType restPot;
154 >    MPI::COMM_WORLD.Allreduce(&restPot_local, &restPot, 1,
155 >                              MPI::REALTYPE, MPI::SUM);
156 >    MPI::COMM_WORLD.Allreduce(&vHarm_local, &vHarm_, 1,
157 >                              MPI::REALTYPE, MPI::SUM);        
158 >    lrPot_ += restPot;
159 > #else
160 >    lrPot_ += restPot_local;
161 >    vHarm_ = vHarm_local;
162 > #endif
163 >
164 >    // give the final values to stats
165 >    curSnapshot->statData[Stats::LONG_RANGE_POTENTIAL] = lrPot_;
166 >    curSnapshot->statData[Stats::VHARM] = vHarm_;
167 >  }  
168   }

Diff Legend

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