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 1183 by xsun, Tue Oct 2 12:05:25 2007 UTC vs.
Revision 1245 by chuckv, Tue May 27 16:39:06 2008 UTC

# Line 55 | Line 55
55   #include "applications/dynamicProps/LegendreCorrFunc.hpp"
56   #include "applications/dynamicProps/RadialRCorrFunc.hpp"
57   #include "applications/dynamicProps/ThetaCorrFunc.hpp"
58 – #include "applications/dynamicProps/ActionCorrFunc.hpp"
58   #include "applications/dynamicProps/DirectionalRCorrFunc.hpp"
59 + #include "applications/dynamicProps/EnergyCorrFunc.hpp"
60  
61  
62   using namespace oopse;
# Line 120 | Line 120 | int main(int argc, char* argv[]){
120      corrFunc = new RadialRCorrFunc(info, dumpFileName, sele1, sele2);
121    } else if (args_info.thetacorr_given) {
122      corrFunc = new ThetaCorrFunc(info, dumpFileName, sele1, sele2);
123 –  } else if (args_info.actioncorr_given) {
124 –    corrFunc = new ActionCorrFunc(info, dumpFileName, sele1, sele2);
123    } else if (args_info.drcorr_given) {
124      corrFunc = new DirectionalRCorrFunc(info, dumpFileName, sele1, sele2);
125 <  }
128 <  else if (args_info.vcorr_given) {
125 >  } else if (args_info.vcorr_given) {
126      corrFunc = new VCorrFunc(info, dumpFileName, sele1, sele2);
127 +  } else if (args_info.helfandEcorr_given){
128 +    corrFunc = new EnergyCorrFunc(info, dumpFileName, sele1, sele2);  
129    } else if (args_info.lcorr_given) {
130      int order;
131      if (args_info.order_given)

Diff Legend

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