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 1359 by chrisfen, Thu Aug 31 22:34:49 2006 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 < #define TAKE_THIS_TAG_REAL 2
54 < #endif //is_mpi
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\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 <      }
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();
80 <      }
81 <      else{
82 <        tIntK_ = 1.0;
83 <        sprintf(painCave.errMsg,
84 <                "ThermoIntegration Warning: the tranformation parameter\n"
85 <                "\texponent (k) was not specified. OOPSE will use a default\n"
86 <                "\tvalue of %f. To set k, use the thermodynamicIntegrationK\n"
87 <                "\tvariable.\n",
88 <                tIntK_);
89 <        painCave.isFatal = 0;
90 <        simError();      
91 <      }
92 <    
93 <      if (simParam->getUseSolidThermInt()) {
94 <        // build a restraint object
95 <        restraint_ =  new Restraints(info_, tIntLambda_, tIntK_);
96 <      
97 <      }
98 <    
99 <      // build the scaling factor used to modulate the forces and torques
100 <      factor_ = pow(tIntLambda_, tIntK_);
101 <
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 138 | 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 151 | Line 137 | namespace oopse {
137      tempTau = curSnapshot->statData.getTau();
138      tempTau *= factor_;
139      curSnapshot->statData.setTau(tempTau);
140 < #ifndef IS_MPI
141 <    // do the single processor crystal restraint forces for
142 <    // thermodynamic integration
143 <    if (simParam->getUseSolidThermInt()) {
144 <      
145 <      lrPot_ += restraint_->Calc_Restraint_Forces();
146 <      curSnapshot->statData[Stats::LONG_RANGE_POTENTIAL] = lrPot_;
147 <      
148 <      vHarm_ = restraint_->getVharm();
149 <      curSnapshot->statData[Stats::VHARM] = vHarm_;
140 >
141 >    // now, on to the applied restraining potentials (if needed):
142 >    RealType restPot_local = 0.0;
143 >    RealType vHarm_local = 0.0;
144 >    
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 <    double tempLRPot = 0.0;
161 <    double tempVHarm = 0.0;
162 <    MPI_Status ierr;
169 <    int nproc;
170 <    MPI_Comm_size(MPI_COMM_WORLD, &nproc);
171 <    vHarm_ = 0.0;
160 >    lrPot_ += restPot_local;
161 >    vHarm_ = vHarm_local;
162 > #endif
163  
164 <    // do the MPI crystal restraint forces for each processor
165 <    if (simParam->getUseSolidThermInt()) {
166 <      tempLRPot = restraint_->Calc_Restraint_Forces();
167 <      tempVHarm = restraint_->getVharm();
177 <    }
178 <
179 <    // master receives and accumulates the restraint info
180 <    if (worldRank == 0) {
181 <      for(int i = 0 ; i < nproc; ++i) {
182 <        if (i == worldRank) {
183 <          lrPot_ += tempLRPot;
184 <          vHarm_ += tempVHarm;
185 <        } else {
186 <          MPI_Recv(&tempLRPot, 1, MPI_REALTYPE, i,
187 <                   TAKE_THIS_TAG_REAL, MPI_COMM_WORLD, &ierr);
188 <          MPI_Recv(&tempVHarm, 1, MPI_REALTYPE, i,
189 <                   TAKE_THIS_TAG_REAL, MPI_COMM_WORLD, &ierr);
190 <          lrPot_ += tempLRPot;
191 <          vHarm_ += tempVHarm;
192 <        }
193 <      }
194 <
195 <      // give the final values to stats
196 <      curSnapshot->statData[Stats::LONG_RANGE_POTENTIAL] = lrPot_;
197 <      curSnapshot->statData[Stats::VHARM] = vHarm_;
198 <
199 <    } else {
200 <      // pack up and send the appropriate info to the master node
201 <      for(int j = 1; j < nproc; ++j) {
202 <        if (worldRank == j) {
203 <
204 <          MPI_Send(&tempLRPot, 1, MPI_REALTYPE, 0,
205 <                   TAKE_THIS_TAG_REAL, MPI_COMM_WORLD);
206 <          MPI_Send(&tempVHarm, 1, MPI_REALTYPE, 0,
207 <                   TAKE_THIS_TAG_REAL, MPI_COMM_WORLD);
208 <        }
209 <      }
210 <    }
211 < #endif //is_mpi
212 <  }
213 <  
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