[ViewVC] Diff of: OpenMD/trunk/src/applications/dynamicProps/DynamicProps.cpp

Comparing trunk/src/applications/dynamicProps/DynamicProps.cpp (file contents):
Revision 1596 by gezelter, Mon Jul 25 17:30:53 2011 UTC vs.
Revision 1604 by jmichalk, Mon Aug 8 18:53:40 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
64
65		using namespace OpenMD;
#	Line 123 \| Line 124 \| *int main(int argc, char argv[]){**
124
125
126		TimeCorrFunc* corrFunc;
127	<	if (args_info.dcorr_given){
127	>	if(args_info.sdcorr_given){
128	>	corrFunc = new SystemDipoleCorrFunc(info, dumpFileName, sele1, sele2, memSize);
129	>	} else if (args_info.dcorr_given){
130		corrFunc = new DipoleCorrFunc(info, dumpFileName, sele1, sele2, memSize);
131		} else if (args_info.rcorr_given) {
132		corrFunc = new RCorrFunc(info, dumpFileName, sele1, sele2, memSize);

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