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

Comparing trunk/src/applications/dynamicProps/DynamicProps.cpp (file contents):
Revision 1596 by gezelter, Mon Jul 25 17:30:53 2011 UTC vs.
Revision 1615 by gezelter, Fri Aug 26 17:55:44 2011 UTC

# Line 59 | Line 59
59   #include "applications/dynamicProps/DirectionalRCorrFunc.hpp"
60   #include "applications/dynamicProps/EnergyCorrFunc.hpp"
61   #include "applications/dynamicProps/StressCorrFunc.hpp"
62 + #include "applications/dynamicProps/SystemDipoleCorrFunc.hpp"
63 + #include "applications/dynamicProps/MomentumCorrFunc.hpp"
64  
65  
66   using namespace OpenMD;
# Line 123 | Line 125 | int main(int argc, char* argv[]){
125  
126  
127    TimeCorrFunc* corrFunc;
128 <  if (args_info.dcorr_given){
128 >  if(args_info.sdcorr_given){
129 >    corrFunc = new SystemDipoleCorrFunc(info, dumpFileName, sele1, sele2, memSize);
130 >  } else if (args_info.dcorr_given){
131      corrFunc = new DipoleCorrFunc(info, dumpFileName, sele1, sele2, memSize);
132    } else if (args_info.rcorr_given) {
133      corrFunc = new RCorrFunc(info, dumpFileName, sele1, sele2, memSize);
# Line 139 | Line 143 | int main(int argc, char* argv[]){
143      corrFunc = new EnergyCorrFunc(info, dumpFileName, sele1, sele2, memSize);
144    } else if (args_info.stresscorr_given){
145      corrFunc = new StressCorrFunc(info, dumpFileName, sele1, sele2, memSize);
146 +  } else if (args_info.momentum_given){
147 +    corrFunc = new MomentumCorrFunc(info, dumpFileName, sele1, sele2, memSize);
148    } else if (args_info.lcorr_given) {
149      int order;
150      if (args_info.order_given)

Diff Legend

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